diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 76b4184..26bcd03 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -37,22 +37,10 @@
         "MicrodroidPrivateLinkingNativeLib",
     ],
     min_sdk_version: "33",
+    // Defined in ../vmshareapp/Android.bp
     data: [":MicrodroidVmShareApp"],
 }
 
-// Helper app to verify that we can create a VM using others app payload.
-android_test_helper_app {
-    name: "MicrodroidVmShareApp",
-    defaults: ["MicrodroidTestAppsDefaults"],
-    jni_libs: [
-        "MicrodroidPayloadInOtherAppNativeLib",
-    ],
-    min_sdk_version: "UpsideDownCake",
-    manifest: "AndroidManifest_VmShareApp.xml",
-    // The MicrodroidVmShareApp doesn't need assets.
-    asset_dirs: [],
-}
-
 // Defaults shared between MicrodroidTestNativeLib and MicrodroidPayloadInOtherAppNativeLib shared
 // libs. They are expected to share everything apart from the name, so that one app
 // (MicrodroidTestApp) can start a payload defined in the another app (MicrodroidVmShareApp).
diff --git a/tests/vmshareapp/Android.bp b/tests/vmshareapp/Android.bp
new file mode 100644
index 0000000..2b117a1
--- /dev/null
+++ b/tests/vmshareapp/Android.bp
@@ -0,0 +1,15 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+// Helper app to verify that we can create a VM using others app payload, and share VMs between apps
+android_test_helper_app {
+    name: "MicrodroidVmShareApp",
+    // Defaults are defined in ../testapk/Android.bp
+    defaults: ["MicrodroidTestAppsDefaults"],
+    jni_libs: [
+        // Defined in ../testapk/Android.bp
+        "MicrodroidPayloadInOtherAppNativeLib",
+    ],
+    min_sdk_version: "UpsideDownCake",
+}
diff --git a/tests/testapk/AndroidManifest_VmShareApp.xml b/tests/vmshareapp/AndroidManifest.xml
similarity index 100%
rename from tests/testapk/AndroidManifest_VmShareApp.xml
rename to tests/vmshareapp/AndroidManifest.xml