diff --git a/lib/anacondatest.pm b/lib/anacondatest.pm
index 32e67dcc..24f7245d 100644
--- a/lib/anacondatest.pm
+++ b/lib/anacondatest.pm
@@ -1,4 +1,4 @@
-package anacondalog;
+package anacondatest;
 use base 'fedorabase';
 
 # base class for all Anaconda (installation) tests
diff --git a/lib/installedtest.pm b/lib/installedtest.pm
index 5470cc6a..eb7b1842 100644
--- a/lib/installedtest.pm
+++ b/lib/installedtest.pm
@@ -1,4 +1,4 @@
-package fedoralog;
+package installedtest;
 use base 'fedorabase';
 
 # base class for tests that run on installed system
diff --git a/tests/upgrade_postinstall_desktop.pm b/tests/upgrade_postinstall_desktop.pm
index 0ba3c32e..26e0d5d1 100644
--- a/tests/upgrade_postinstall_desktop.pm
+++ b/tests/upgrade_postinstall_desktop.pm
@@ -5,7 +5,7 @@ use testapi;
 
 sub run {
     my $self = shift;
-    my $password = get_var("PASSWORD", "weakpassword");
+    my $password = get_var("USER_PASSWORD", "weakpassword");
 
     # wait for GDM to appear
     $self->boot_to_login_screen("graphical_login", 20);