diff --git a/tests/plugins/TapDance/basic/test.ktest b/tests/plugins/TapDance/basic/test.ktest
index 64d90c94..24d41faa 100644
--- a/tests/plugins/TapDance/basic/test.ktest
+++ b/tests/plugins/TapDance/basic/test.ktest
@@ -20,8 +20,8 @@ RUN 5 ms
 PRESS X
 RUN 1 cycle
 EXPECT keyboard-report Key_B # The report should contain `B`
-EXPECT keyboard-report empty # Report should be empty
 RUN 1 cycle
+EXPECT keyboard-report empty # Report should be empty
 EXPECT keyboard-report Key_X # Report should contain `X`
 
 RUN 5 ms
@@ -47,59 +47,57 @@ RUN 20 ms # Timeout = 25ms
 
 RUN 2 ms # Extra 2 cycles for some reason
 EXPECT keyboard-report Key_B # The report should contain `B`
+RUN 1 cycle
 EXPECT keyboard-report empty # Report should be empty
 
 # ==============================================================================
-# The testcases below are commented out because they are currently failing.
+NAME Tapdance interrupt with rollover
 
-# # ==============================================================================
-# NAME Tapdance interrupt with rollover
-
-# RUN 5 ms
-# PRESS TD_0
-# RUN 5 ms
-# RELEASE TD_0
+RUN 5 ms
+PRESS TD_0
+RUN 5 ms
+RELEASE TD_0
 
-# RUN 10 ms
-# PRESS TD_0
+RUN 10 ms
+PRESS TD_0
 
-# RUN 5 ms
-# PRESS X
-# RUN 1 cycle
-# EXPECT keyboard-report Key_B # The report should contain `B`
-# RUN 1 cycle
-# EXPECT keyboard-report Key_B Key_X # Report should contain `B` & `X`
+RUN 5 ms
+PRESS X
+RUN 1 cycle
+EXPECT keyboard-report Key_B # The report should contain `B`
+RUN 1 cycle
+EXPECT keyboard-report Key_B Key_X # Report should contain `B` & `X`
 
-# RUN 5 ms
-# RELEASE TD_0
-# RUN 1 cycle
-# EXPECT keyboard-report Key_X # Report should contain `X`
+RUN 5 ms
+RELEASE TD_0
+RUN 1 cycle
+EXPECT keyboard-report Key_X # Report should contain `X`
 
 
-# RUN 5 ms
-# RELEASE X
-# RUN 1 cycle
-# EXPECT keyboard-report empty # Report should be empty
+RUN 5 ms
+RELEASE X
+RUN 1 cycle
+EXPECT keyboard-report empty # Report should be empty
 
-# # ==============================================================================
-# NAME Tapdance timeout while held
+# ==============================================================================
+NAME Tapdance timeout while held
 
-# RUN 5 ms
+RUN 5 ms
 
-# PRESS TD_0
-# RUN 5 ms
-# RELEASE TD_0
-# RUN 10 ms
+PRESS TD_0
+RUN 5 ms
+RELEASE TD_0
+RUN 10 ms
 
-# PRESS TD_0
-# RUN 1 cycle
-# RUN 25 ms
+PRESS TD_0
+RUN 1 cycle
+RUN 25 ms
 
-# RUN 2 cycles
-# EXPECT keyboard-report Key_B # The report should contain `B`
+RUN 2 cycles
+EXPECT keyboard-report Key_B # The report should contain `B`
 
-# RUN 10 ms
-# RELEASE TD_0
-# RUN 1 cycle
+RUN 10 ms
+RELEASE TD_0
+RUN 1 cycle
 
-# EXPECT keyboard-report empty # Report should be empty
+EXPECT keyboard-report empty # Report should be empty