diff --git a/tests/windows_install.pm b/tests/windows_install.pm
index f50f3635..5fe5c436 100644
--- a/tests/windows_install.pm
+++ b/tests/windows_install.pm
@@ -6,91 +6,91 @@ use utils;
 sub run {
     my $self = shift;
     # Check whether we have arrived in the main installation screen.
-    assert_screen "win_setup_main", 300; #
+    assert_screen "win_setup_main", '', 300; #
 
     # Set up keyboard layouts or languages. For our purposes, a simple 
     # click on the Next button will do.
-    assert_and_click "win_setup_next", 20;
+    assert_and_click "win_setup_next";
 
     # Start installation
-    assert_and_click "win_setup_install", 30;
+    assert_and_click "win_setup_install";
 
     # Accept the EULA.
-    assert_and_click "win_setup_eula_accept", 30;
-    assert_and_click "win_setup_next", 20;
+    assert_and_click "win_setup_eula_accept";
+    assert_and_click "win_setup_next";
 
     # Select the custom installation
-    assert_and_click "win_setup_custom_install", 30;
+    assert_and_click "win_setup_custom_install";
 
     # The drive 0 will always be empty, so just click Next to continue
-    assert_and_click "win_setup_next", 60;
+    assert_and_click "win_setup_next", '', 60;
 
     # Confirm the region, the default US region will be ok.
-    assert_and_click "win_setup_yes", 300;
+    assert_and_click "win_setup_yes", '', 600;
 
     # Confirm the keyboard layout, the default US keyboard will be ok.
-    assert_and_click "win_setup_yes", 60;
+    assert_and_click "win_setup_yes";
 
     # Skip adding the second keyboard, we are not interested anyway.
-    assert_and_click "win_setup_skip", 60;
+    assert_and_click "win_setup_skip";
 
     # If no internet is detected, deal with no internet.
 
     # Join a local domain
-    assert_and_click "win_setup_local_account", 600;
-    assert_and_click "win_setup_bluenext", 20;
+    assert_and_click "win_setup_local_account", '', 600;
+    assert_and_click "win_setup_bluenext";
 
     # Fill-in the account name
     type_very_safely "Fedora";
-    assert_and_click "win_setup_bluenext", 20;
+    assert_and_click "win_setup_bluenext";
 
     # Fill-in the password
     type_very_safely "weakpassword";
-    assert_and_click "win_setup_bluenext", 20;
+    assert_and_click "win_setup_bluenext";
 
     # Confirm the password
     type_very_safely "weakpassword";
-    assert_and_click "win_setup_bluenext", 20;
+    assert_and_click "win_setup_bluenext";
     
     # Deal with security questions
     # What was your first pet's name?
-    assert_and_click "win_setup_security_question", 30;
-    assert_and_click "win_setup_your_pet", 30;
+    assert_and_click "win_setup_security_question";
+    assert_and_click "win_setup_your_pet";
     sleep 1;
     send_key "tab";
     sleep 1;
     type_very_safely "Bob";
-    assert_and_click "win_setup_bluenext", 30;
+    assert_and_click "win_setup_bluenext";
 
     # What was your childhood nickname?
-    assert_and_click "win_setup_security_question", 30;
-    assert_and_click "win_setup_childhood_nickname", 30;
+    assert_and_click "win_setup_security_question";
+    assert_and_click "win_setup_childhood_nickname";
     sleep 1;
     send_key "tab";
     sleep 1;
     type_very_safely "Bob";
-    assert_and_click "win_setup_bluenext", 30;
+    assert_and_click "win_setup_bluenext";
 
     # What was the name of your oldest cousin?
-    assert_and_click "win_setup_security_question", 30;
-    assert_and_click "win_setup_oldest_cousin", 30;
+    assert_and_click "win_setup_security_question";
+    assert_and_click "win_setup_oldest_cousin";
     sleep 1;
     send_key "tab";
     sleep 1;
     type_very_safely "Bob";
-    assert_and_click "win_setup_bluenext", 30;
+    assert_and_click "win_setup_bluenext";
 
     # Refuse the activity history.
-    assert_and_click "win_setup_blueno", 30;
+    assert_and_click "win_setup_blueno";
 
     # Refuse digital assistant
-    assert_and_click "win_setup_decline", 30;
+    assert_and_click "win_setup_decline";
 
     # Accept suggested values (bad but fast and easy)
-    assert_and_click "win_setup_accept", 30;
+    assert_and_click "win_setup_accept";
 
     # Check if booted
-    assert_screen "win_setup_booted_logged", 600;
+    assert_screen "win_setup_booted_logged", '', 600;
     
 }