diff --git a/platforms/gpio/button_driver_test.go b/platforms/gpio/button_driver_test.go
index 0426db44..e7deb48e 100644
--- a/platforms/gpio/button_driver_test.go
+++ b/platforms/gpio/button_driver_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hybridgroup/gobot"
 )
 
-const BUTTON_TEST_DELAY = 100
+const BUTTON_TEST_DELAY = 30
 
 func initTestButtonDriver() *ButtonDriver {
 	return NewButtonDriver(newGpioTestAdaptor("adaptor"), "bot", "1")
diff --git a/platforms/gpio/makey_button_driver_test.go b/platforms/gpio/makey_button_driver_test.go
index 09ceeee7..fc3e65e8 100644
--- a/platforms/gpio/makey_button_driver_test.go
+++ b/platforms/gpio/makey_button_driver_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hybridgroup/gobot"
 )
 
-const MAKEY_TEST_DELAY = 100
+const MAKEY_TEST_DELAY = 30
 
 func initTestMakeyButtonDriver() *MakeyButtonDriver {
 	return NewMakeyButtonDriver(newGpioTestAdaptor("adaptor"), "bot", "1")