diff --git a/Android/jni/jnihooks.c b/Android/jni/jnihooks.c
index bc1bf93d..ae30231c 100644
--- a/Android/jni/jnihooks.c
+++ b/Android/jni/jnihooks.c
@@ -61,18 +61,21 @@ static void _start_tests(void) {
     extern int test_cpu(int, char *[]);
     test_cpu(local_argc, local_argv);
     kill(getpid(), SIGKILL); // and we're done ...
-#elif TEST_VM
-    extern void test_vm(int, char *[]);
-    test_vm(local_argc, local_argv);
-#elif TEST_DISPLAY
-    extern void test_display(int, char *[]);
-    test_display(local_argc, local_argv);
 #elif TEST_DISK
     extern void test_disk(int, char *[]);
     test_disk(local_argc, local_argv);
+#elif TEST_DISPLAY
+    extern void test_display(int, char *[]);
+    test_display(local_argc, local_argv);
 #elif TEST_PREFS
     extern void test_prefs(int, char *[]);
     test_prefs(local_argc, local_argv);
+#elif TEST_TRACE
+    extern void test_trace(int, char *[]);
+    test_trace(local_argc, local_argv);
+#elif TEST_VM
+    extern void test_vm(int, char *[]);
+    test_vm(local_argc, local_argv);
 #else
 #   error "OOPS, no tests specified"
 #endif
diff --git a/Apple2Mac/Classes/OSX/EmulatorGLView.m b/Apple2Mac/Classes/OSX/EmulatorGLView.m
index ee0cee0f..059cddab 100644
--- a/Apple2Mac/Classes/OSX/EmulatorGLView.m
+++ b/Apple2Mac/Classes/OSX/EmulatorGLView.m
@@ -206,21 +206,21 @@ static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
     // Currently this test is the only one that blocks current thread and runs as a black screen
     extern int test_cpu(int, char *[]);
     test_cpu(local_argc, local_argv);
-#   elif TEST_VM
-    extern int test_vm(int, char *[]);
-    test_vm(local_argc, local_argv);
-#   elif TEST_DISPLAY
-    extern int test_display(int, char *[]);
-    test_display(local_argc, local_argv);
 #   elif TEST_DISK
     extern int test_disk(int, char *[]);
     test_disk(local_argc, local_argv);
+#   elif TEST_DISPLAY
+    extern int test_display(int, char *[]);
+    test_display(local_argc, local_argv);
 #   elif TEST_PREFS
     extern void test_prefs(int, char *[]);
     test_prefs(local_argc, local_argv);
 #   elif TEST_TRACE
     extern void test_trace(int, char *[]);
     test_trace(local_argc, local_argv);
+#   elif TEST_VM
+    extern int test_vm(int, char *[]);
+    test_vm(local_argc, local_argv);
 #   else
 #       error "OOPS, no testsuite specified"
 #   endif
diff --git a/Apple2Mac/Classes/iOS/EAGLView.m b/Apple2Mac/Classes/iOS/EAGLView.m
index 5366e874..80402777 100644
--- a/Apple2Mac/Classes/iOS/EAGLView.m
+++ b/Apple2Mac/Classes/iOS/EAGLView.m
@@ -95,21 +95,21 @@
         // Currently this test is the only one that blocks current thread and runs as a black screen
         extern int test_cpu(int, char *[]);
         test_cpu(local_argc, local_argv);
-#   elif TEST_VM
-        extern int test_vm(int, char *[]);
-        test_vm(local_argc, local_argv);
-#   elif TEST_DISPLAY
-        extern int test_display(int, char *[]);
-        test_display(local_argc, local_argv);
 #   elif TEST_DISK
         extern int test_disk(int, char *[]);
         test_disk(local_argc, local_argv);
+#   elif TEST_DISPLAY
+        extern int test_display(int, char *[]);
+        test_display(local_argc, local_argv);
 #   elif TEST_PREFS
         extern void test_prefs(int, char *[]);
         test_prefs(local_argc, local_argv);
 #   elif TEST_TRACE
         extern void test_trace(int, char *[]);
         test_trace(local_argc, local_argv);
+#   elif TEST_VM
+        extern int test_vm(int, char *[]);
+        test_vm(local_argc, local_argv);
 #   else
 #       error "OOPS, no testsuite specified"
 #   endif
diff --git a/src/misc.c b/src/misc.c
index 372c0180..225b8edd 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -316,21 +316,21 @@ int main(int _argc, char **_argv) {
     // Currently this test is the only one that blocks current thread and runs as a black screen
     extern int test_cpu(int, char *[]);
     test_cpu(argc, argv);
-#   elif TEST_VM
-    extern int test_vm(int, char *[]);
-    test_vm(argc, argv);
-#   elif TEST_DISPLAY
-    extern int test_display(int, char *[]);
-    test_display(argc, argv);
 #   elif TEST_DISK
     extern int test_disk(int, char *[]);
     test_disk(argc, argv);
+#   elif TEST_DISPLAY
+    extern int test_display(int, char *[]);
+    test_display(argc, argv);
 #   elif TEST_PREFS
     extern void test_prefs(int, char *[]);
     test_prefs(argc, argv);
 #   elif TEST_TRACE
     extern void test_trace(int, char *[]);
     test_trace(argc, argv);
+#   elif TEST_VM
+    extern int test_vm(int, char *[]);
+    test_vm(argc, argv);
 #   else
 #       error "OOPS, no testsuite specified"
 #   endif