diff --git a/build/defaults.mak b/build/defaults.mak
index e4f889b20..d8a0c8c0d 100644
--- a/build/defaults.mak
+++ b/build/defaults.mak
@@ -42,6 +42,10 @@ ifeq ("$(origin V)", "command line")
   endif
 endif
 
+ifeq ("$(PLATFORM)", "device")
+  SFLAGS += -DPLATFORM_DEVICE
+endif
+
 # Host detection
 ifeq ($(OS),Windows_NT)
 HOST = windows
diff --git a/quiz/src/runner.cpp b/quiz/src/runner.cpp
index bc61d67e3..dae22605a 100644
--- a/quiz/src/runner.cpp
+++ b/quiz/src/runner.cpp
@@ -24,8 +24,14 @@ static inline void ion_main_inner() {
     i++;
   }
   quiz_print("ALL TESTS FINISHED");
+#ifdef PLATFORM_DEVICE
+  while (1) {
+    Ion::Timing::msleep(100000);
+  }
+#endif
 }
 
+
 void ion_main(int argc, const char * const argv[]) {
   // Initialize the backlight
   Ion::Backlight::init();