diff --git a/lib/anacondalog.pm b/lib/anacondalog.pm
index bd3c8b3a..6d247664 100644
--- a/lib/anacondalog.pm
+++ b/lib/anacondalog.pm
@@ -7,7 +7,7 @@ sub post_fail_hook {
     my $self = shift;
     send_key "ctrl-alt-f2";
     if (check_screen "anaconda_console", 10) {
-        upload_logs "/tmp/X.log";
+        upload_logs "/tmp/X.log";  # TODO: it can't type "X"
         upload_logs "/tmp/anaconda.log";
         upload_logs "/tmp/packaging.log";
         upload_logs "/tmp/storage.log";
diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index 25c1b538..2cc18eed 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;
 
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index ec3b4793..02404206 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -10,24 +10,27 @@ sub run {
     assert_and_click "anaconda_main_hub_begin_installation";
 
     # Set root password
+    my $root_password = get_var("ROOT_PASSWORD") || "weakpassword";
     assert_and_click "anaconda_install_root_password";
-    type_string "weakpassword";
+    type_string $root_password;
     send_key "tab";
-    type_string "weakpassword";
+    type_string $root_password;
     assert_and_click "anaconda_spoke_done";
     # weak password - click "done" once again"
     #assert_and_click "anaconda_spoke_done";
 
     # Set user details
+    my $user_login = get_var("USER_LOGIN") || "test";
+    my $user_password = get_var("USER_PASSWORD") || "weakpassword";
     assert_and_click "anaconda_install_user_creation";
-    type_string "test";
+    type_string $user_login;
     send_key "tab";
     send_key "tab";
     send_key "tab";
     send_key "tab";
-    type_string "weakpassword";
+    type_string $user_password;
     send_key "tab";
-    type_string "weakpassword";
+    type_string $user_password;
     assert_and_click "anaconda_install_user_creation_make_admin";
     assert_and_click "anaconda_spoke_done";
     # weak password - click "done" once again"
diff --git a/tests/_select_minimal.pm b/tests/_select_minimal.pm
index dc434faa..9e71d69d 100644
--- a/tests/_select_minimal.pm
+++ b/tests/_select_minimal.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;
 
diff --git a/tests/disk_guided_delete_partial.pm b/tests/disk_guided_delete_partial.pm
index 71d03ac1..c68315a3 100644
--- a/tests/disk_guided_delete_partial.pm
+++ b/tests/disk_guided_delete_partial.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;
 
diff --git a/tests/disk_guided_empty.pm b/tests/disk_guided_empty.pm
index d57df78e..66bbc694 100644
--- a/tests/disk_guided_empty.pm
+++ b/tests/disk_guided_empty.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;
 
diff --git a/tests/disk_guided_encrypted.pm b/tests/disk_guided_encrypted.pm
index fbb20528..caf3a364 100644
--- a/tests/disk_guided_encrypted.pm
+++ b/tests/disk_guided_encrypted.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;
 
diff --git a/tests/disk_guided_multi.pm b/tests/disk_guided_multi.pm
index ac98ab19..16a969e6 100644
--- a/tests/disk_guided_multi.pm
+++ b/tests/disk_guided_multi.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;
 
diff --git a/tests/install_source_graphical.pm b/tests/install_source_graphical.pm
index b9cb79ea..118c3b77 100644
--- a/tests/install_source_graphical.pm
+++ b/tests/install_source_graphical.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;
 
diff --git a/tests/install_source_variation.pm b/tests/install_source_variation.pm
index 95903ce8..0c6de541 100644
--- a/tests/install_source_variation.pm
+++ b/tests/install_source_variation.pm
@@ -1,4 +1,4 @@
-use base "basetest";
+use base "anacondalog";
 use strict;
 use testapi;