diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index beca3ce..1fc1b7a 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -87,6 +87,11 @@
                 "plat_keystore2_key_contexts",
             ],
         },
+        lib64: {
+            deps: [
+                "zipfuse",
+            ],
+        },
     },
     linker_config_src: "linker.config.json",
     base_dir: "system",
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index 0d4bf8e..5958480 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -63,6 +63,11 @@
         return result.getStdout().trim(); // remove the trailing whitespace including newline
     }
 
+    private String executeCommandOnMicrodroid(String cmd) {
+        cmd = "adb -s " + MICRODROID_SERIAL + " " + cmd;
+        return executeCommand(cmd);
+    }
+
     @Test
     public void testMicrodroidBoots() throws Exception {
         // Prepare input files
@@ -149,7 +154,7 @@
                         + TEST_VM_CID
                         + ":5555");
         executeCommand("adb connect " + MICRODROID_SERIAL);
-        String prop = executeCommand("adb -s " + MICRODROID_SERIAL + " shell getprop ro.hardware");
+        String prop = executeCommandOnMicrodroid("shell getprop ro.hardware");
         assertThat(prop, is("microdroid"));
 
         // Test writing to /data partition
@@ -159,16 +164,14 @@
         writer.write("MicrodroidTest");
         writer.close();
 
-        executeCommand(
-                "adb -s "
-                        + MICRODROID_SERIAL
-                        + " push "
-                        + tmpFile.getPath()
-                        + " /data/local/tmp/test.txt");
-        String catResult =
-                executeCommand(
-                        "adb -s " + MICRODROID_SERIAL + " shell cat /data/local/tmp/test.txt");
-        assertThat(catResult, is("MicrodroidTest"));
+        executeCommandOnMicrodroid("push " + tmpFile.getPath() + " /data/local/tmp/test.txt");
+        assertThat(
+                executeCommandOnMicrodroid("shell cat /data/local/tmp/test.txt"),
+                is("MicrodroidTest"));
+
+        assertThat(
+                executeCommandOnMicrodroid("shell ls /system/bin/zipfuse"),
+                is("/system/bin/zipfuse"));
 
         // Shutdown microdroid
         executeCommand("adb -s localhost:" + TEST_VM_ADB_PORT + " shell reboot");
