diff --git a/right/src/main.c b/right/src/main.c
index 133719e82..60c144b1f 100644
--- a/right/src/main.c
+++ b/right/src/main.c
@@ -28,6 +28,7 @@
 #include "macros/shortcut_parser.h"
 #include "macros/keyid_parser.h"
 #include "ledmap.h"
+#include "test_suite/test_hooks.h"
 #include "debug.h"
 #include "event_scheduler.h"
 #include "config_parser/config_globals.h"
@@ -249,7 +250,11 @@ int main(void)
 
         while (1) {
             Trace_Printc("{");
-            CopyRightKeystateMatrix();
+            if (TestHooks_Active) {
+                TestHooks_Tick();
+            } else {
+                CopyRightKeystateMatrix();
+            }
 
             if (CurrentPowerMode >= PowerMode_Lock) {
                 checkSleepMode();