1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index 090b2bd801..a846346edd 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -48,7 +48,6 @@
 #include "gc/space/image_space.h"
 #include "gc_root-inl.h"
 #include "gtest/gtest.h"
-#include "gtest_extras/IsolateMain.h"
 #include "handle_scope-inl.h"
 #include "interpreter/unstarted_runtime.h"
 #include "jni/java_vm_ext.h"
@@ -659,7 +658,7 @@ __attribute__((visibility("default"))) __attribute__((weak))
 void ArtTestGlobalInit() {
 }
 
-int main(int argc, char** argv, char** envp) {
+int main(int argc, char **argv) {
   // Gtests can be very noisy. For example, an executable with multiple tests will trigger native
   // bridge warnings. The following line reduces the minimum log severity to ERROR and suppresses
   // everything else. In case you want to see all messages, comment out the line.
@@ -669,6 +668,7 @@ int main(int argc, char** argv, char** envp) {
   art::InitLogging(argv, art::Runtime::Abort);
   art::MemMap::Init();
   LOG(INFO) << "Running main() from common_runtime_test.cc...";
+  testing::InitGoogleTest(&argc, argv);
   ArtTestGlobalInit();
-  return IsolateMain(argc, argv, envp);
+  return RUN_ALL_TESTS();
 }