diff --git a/scripts/avd_patch.sh b/scripts/avd_patch.sh
index bd8f686fb..a1c625014 100644
--- a/scripts/avd_patch.sh
+++ b/scripts/avd_patch.sh
@@ -43,8 +43,6 @@ if [ -z "$FIRST_STAGE" ]; then
   exec ./busybox sh $0
 fi
 
-pm install -r $(pwd)/app-debug.apk
-
 # Extract files from APK
 unzip -oj app-debug.apk 'assets/util_functions.sh'
 . ./util_functions.sh
diff --git a/scripts/avd_test.sh b/scripts/avd_test.sh
new file mode 100755
index 000000000..59f884da9
--- /dev/null
+++ b/scripts/avd_test.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+set -xe
+
+cleanup() {
+  echo -e '\n\033[41m! An error occurred\033[0m\n'
+  pkill -INT -P $$
+  wait
+}
+
+trap cleanup EXIT
+
+emu="$ANDROID_SDK_ROOT/emulator/emulator"
+avd="$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/avdmanager
+sdk="$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager
+type='google_apis'
+emu_args='-no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim'
+
+wait_for_boot() {
+  while true; do
+    if [ -n "$(adb shell getprop sys.boot_completed)" ]; then
+      break
+    fi
+    sleep 2
+  done
+}
+
+export -f wait_for_boot
+
+test_api() {
+  local pkg pid ramdisk
+
+  # Setup emulator
+  pkg="system-images;android-$1;$type;x86_64"
+
+  echo -e "\n\033[44m* Testing $pkg\033[0m\n"
+
+  "$sdk" $pkg
+  echo no | "$avd" create avd -f -n test -k $pkg
+
+  # Launch emulator and patch
+  ramdisk="$ANDROID_SDK_ROOT/system-images/android-$1/$type/x86_64/ramdisk.img"
+  if [ -f "${ramdisk}.bak" ]; then
+    cp "${ramdisk}.bak" "$ramdisk"
+  fi
+  $emu @test $emu_args &
+  pid=$!
+  timeout 60 adb wait-for-device
+  ./build.py avd_patch -s $ramdisk
+  kill -INT $pid
+  wait $pid
+
+  # Test if it boots properly
+  $emu @test $emu_args &
+  pid=$!
+  timeout 60 adb wait-for-device
+  timeout 60 bash -c wait_for_boot
+
+  adb shell magisk -v
+  kill -INT $pid
+  wait $pid
+}
+
+# Build our executables
+./build.py binary
+./build.py app
+
+# We test the following API levels for the following reason:
+# API 23: legacy rootfs w/o Treble
+# API 26: legacy rootfs with Treble
+# API 28: legacy system-as-root
+# API 32: 2 Stage Init
+
+for api in 23 26 28 32; do
+  test_api $api
+done
+
+trap - EXIT