diff --git a/repos/dde_linux/run/usb_hid_reconnect.run b/repos/dde_linux/run/usb_hid_reconnect.run
index c82109d982..9a60d66e37 100644
--- a/repos/dde_linux/run/usb_hid_reconnect.run
+++ b/repos/dde_linux/run/usb_hid_reconnect.run
@@ -1,7 +1,7 @@
 #
 # USB HID test
 #
-# Test connect and disconnect
+# Test connect and disconnect on Qemu
 
 assert_spec x86
 
@@ -10,13 +10,8 @@ if {[have_spec linux]} {
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_include "power_on/qemu"]} {
-	puts "Run script does not support autopilot mode on Qemu."
-	exit 0
-}
-
-if {[get_cmd_switch --autopilot] && ![have_spec x86_64]} {
-	puts "Run script does not support autopilot mode on this platform."
+if {![have_include "power_on/qemu"]} {
+	puts "Test requires to be run on Qemu."
 	exit 0
 }
 
@@ -169,8 +164,6 @@ build_boot_image $boot_modules
 
 append qemu_args " -device nec-usb-xhci,id=xhci -device usb-kbd,bus=xhci.0 -nographic"
 
-# autopilot test
-#run_genode_until forever
 # wait for keyboard
 run_genode_until {.*USB HID.*Keyboard.*} 60
 
@@ -188,12 +181,14 @@ for {set i 0} {$i < 50} {incr i} {
 	send "device_add usb-kbd,id=ukb1\n"
 
 	# wait for keyboard
-	run_genode_until {.*USB HID.*Keyboard.*\n} 20 $spawn_id
+	run_genode_until {.*USB HID.*Keyboard.*\n} 10 $spawn_id
 
 	# disconnect keyboard
 	send "device_del ukb1\n"
 
 	# wait for disconnect
-	run_genode_until {.*USB disconnect.*\n} 20 $spawn_id
+	run_genode_until {.*USB disconnect.*\n} 10 $spawn_id
 
 }
+
+puts "\nTest succeeded\n"
diff --git a/tool/autopilot.list b/tool/autopilot.list
index fd16606e60..f655a72b88 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -69,6 +69,7 @@ timeout_smp
 timer_accuracy
 tz_vmm
 usb_hid_raw
+usb_hid_reconnect
 vbox5_genode_usb_hid_raw
 vbox5_ubuntu_16_04_32
 vbox5_ubuntu_16_04_64