diff --git a/README b/README
index 5a305d6ab..885f14e38 100644
--- a/README
+++ b/README
@@ -63,11 +63,6 @@ Requirements:
 - (optionally) ninja; if you've got this, this will be autodetected and give
   you faster builds.
 
-- (optionally) the qemu suite: if you have this installed, the build system
-  will detect it automatically and run the test suites for the supported
-  architectures. Get both the qemu-system-* platform emulators and the qemu-*
-  userland emulators (only works on Linux).
-
 - about 115MB free in /tmp (or some other temporary directory).
 
 - about 15MB in the target directory.
diff --git a/build.lua b/build.lua
index b0c2beebd..418bc7dc0 100644
--- a/build.lua
+++ b/build.lua
@@ -23,9 +23,9 @@ vars.plats = {
 vars.plats_with_tests = {
 	"cpm",
 	"linux68k",
-	"linux386",
+	--"linux386",
 	"linuxppc",
-	"linuxmips",
+	--"linuxmips",
 	"pc86",
 }
 
diff --git a/plat/linux386/tests/build.lua b/plat/linux386/tests/build.lua
deleted file mode 100644
index afd12fdce..000000000
--- a/plat/linux386/tests/build.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-include("tests/plat/build.lua")
-
-plat_testsuite {
-    name = "tests",
-    plat = "linux386",
-    method = "qemu-i386"
-}
diff --git a/plat/linuxmips/tests/build.lua b/plat/linuxmips/tests/build.lua
deleted file mode 100644
index b2b660568..000000000
--- a/plat/linuxmips/tests/build.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-include("tests/plat/build.lua")
-
-plat_testsuite {
-    name = "tests",
-    plat = "linuxmips",
-    method = "qemu-mipsel",
-    skipsets = {
-        "long-long",
-    },
-}
diff --git a/tests/plat/testdriver.sh b/tests/plat/testdriver.sh
index 1a4568db7..e4b872f6b 100755
--- a/tests/plat/testdriver.sh
+++ b/tests/plat/testdriver.sh
@@ -12,29 +12,9 @@ errcho() {
 
 get_test_output() {
     case $method in
-        qemu-system-*)
-            if ! command -v $method >/dev/null 2>&1 ; then
-                errcho "Warning: $method not installed, skipping test"
-                echo "@@SKIPPED"
-                exit 0
-            fi
-
-            case $method in
-                qemu-system-i386) img="-drive file=$img,if=floppy,format=raw" ;;
-                qemu-system-ppc)  img="-kernel $img" ;;
-            esac
-
-            $timeoutprog -t $timeout -- $method -nographic $img 2>&1
-            ;;
-
         qemu-*)
-            if ! command -v $method >/dev/null 2>&1 ; then
-                errcho "Warning: $method not installed, skipping test"
-                echo "@@SKIPPED"
-                exit 0
-            fi
-
-            $method $img 2>&1
+			errcho "qemu tests no longer supported (method $method)"
+			exit 1
             ;;
 
         *)