diff --git a/TEST_MAPPING b/TEST_MAPPING
index 69f5518..b07dc3b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,9 +8,7 @@
     },
     {
       "name": "VirtualizationTestCases"
-    }
-  ],
-  "postsubmit": [
+    },
     {
       "name": "MicrodroidTestApp"
     }
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 8ff2127..619044f 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -97,6 +97,8 @@
         void forceStop(VirtualMachine vm) {
             try {
                 vm.stop();
+                this.onDied(vm);
+                Looper.myLooper().quitSafely();
             } catch (VirtualMachineException e) {
                 throw new RuntimeException(e);
             }
@@ -158,13 +160,13 @@
                     private boolean mPayloadStartedCalled = false;
 
                     @Override
-                    public void onPayloadReady(VirtualMachine vm) {
-                        mPayloadReadyCalled = true;
+                    public void onPayloadStarted(VirtualMachine vm, ParcelFileDescriptor stream) {
+                        mPayloadStartedCalled = true;
                     }
 
                     @Override
-                    public void onPayloadStarted(VirtualMachine vm, ParcelFileDescriptor stream) {
-                        mPayloadStartedCalled = true;
+                    public void onPayloadReady(VirtualMachine vm) {
+                        mPayloadReadyCalled = true;
                         forceStop(vm);
                     }