diff --git a/ld_script_test.ld b/ld_script_test.ld
index f6b9659a19..a40329ff1c 100644
--- a/ld_script_test.ld
+++ b/ld_script_test.ld
@@ -19,6 +19,7 @@ SECTIONS {
     {
         __ewram_start = .;
         *(.ewram*)
+        . = ALIGN(4);
         __ewram_end = .;
     } > EWRAM
 
diff --git a/test/test_runner.c b/test/test_runner.c
index 218061d63f..450283ab58 100644
--- a/test/test_runner.c
+++ b/test/test_runner.c
@@ -446,6 +446,11 @@ top:
     case STATE_EXIT:
         MgbaExit_(gTestRunnerState.exitCode);
         break;
+    default:
+        MgbaOpen_();
+        Test_MgbaPrintf("\e[31mInvalid TestRunner state, exiting\e[0m");
+        gTestRunnerState.exitCode = 1;
+        gTestRunnerState.state = STATE_EXIT;
     }
 
     if (gMain.callback2 == CB2_TestRunner)