diff --git a/tests/plugins/OneShot/basic/basic.ino b/tests/plugins/OneShot/basic/basic.ino
index 8adcfcc9..0e335dc9 100644
--- a/tests/plugins/OneShot/basic/basic.ino
+++ b/tests/plugins/OneShot/basic/basic.ino
@@ -44,9 +44,9 @@ KALEIDOSCOPE_INIT_PLUGINS(OneShot);
 
 void setup() {
   Kaleidoscope.setup();
-  OneShot.time_out = 50;
-  OneShot.hold_time_out = 20;
-  OneShot.double_tap_time_out = 20;
+  OneShot.setTimeout(50);
+  OneShot.setHoldTimeout(20);
+  OneShot.setDoubleTapTimeout(20);
 }
 
 void loop() {
diff --git a/tests/plugins/OneShot/basic/test.ktest b/tests/plugins/OneShot/basic/test.ktest
index 8d04bba5..fdb05b11 100644
--- a/tests/plugins/OneShot/basic/test.ktest
+++ b/tests/plugins/OneShot/basic/test.ktest
@@ -32,7 +32,7 @@ RUN 10 ms
 PRESS A
 RUN 1 cycle
 EXPECT keyboard-report Key_LeftShift Key_A # There should be `shift`+`A`
-RUN 1 cycle
+RUN 2 cycle
 EXPECT keyboard-report Key_A # There should be only `A`
 RUN 5 ms
 RELEASE A
@@ -76,11 +76,10 @@ EXPECT keyboard-report Key_LeftShift # The report should contain `shift`
 
 RUN 5 ms
 PRESS OS_shift
-RUN 1 cycle
-EXPECT keyboard-report empty # Report should be empty
 RUN 5 ms
 RELEASE OS_shift
 RUN 1 cycle
+EXPECT keyboard-report empty # Report should be empty
 
 # ==============================================================================
 NAME OneShot double tap timeout
@@ -137,7 +136,7 @@ RUN 1 cycle
 EXPECT keyboard-report Key_LeftShift Key_A # There should be `shift`+`A`
 RUN 5 ms
 RELEASE OS_shift
-RUN 2 cycles # 2 cycles?
+RUN 1 cycle
 EXPECT keyboard-report Key_A # There should be only `A`
 RUN 5 ms
 RELEASE A