diff --git a/src/exception_test.cc b/src/exception_test.cc
index 06ae7fb..37788df 100644
--- a/src/exception_test.cc
+++ b/src/exception_test.cc
@@ -117,9 +117,9 @@
 }
 
 TEST_F(ExceptionTest, StackTraceElement) {
-  Thread::Current()->TransitionFromSuspendedToRunnable();
-  runtime_->Start();
   Thread* thread = Thread::Current();
+  thread->TransitionFromSuspendedToRunnable();
+  runtime_->Start();
   JNIEnv* env = thread->GetJniEnv();
   ScopedObjectAccess soa(env);
 
@@ -170,7 +170,6 @@
   fake_stack.push_back(3);
   fake_stack.push_back(0);
 
-  Thread* thread = Thread::Current();
   thread->PushShadowFrame(reinterpret_cast<ShadowFrame*>(&fake_stack[5]));
   thread->PushShadowFrame(reinterpret_cast<ShadowFrame*>(&fake_stack[0]));
 #endif