diff --git a/lib/fedorabase.pm b/lib/fedorabase.pm
index f460536d..ce905097 100644
--- a/lib/fedorabase.pm
+++ b/lib/fedorabase.pm
@@ -88,16 +88,6 @@ sub boot_to_login_screen {
     }
 }
 
-sub get_release {
-    my $self = shift;
-    if (get_var("RAWHIDE")) {
-        return 'rawhide';
-    }
-    else {
-        return lc((split /-/, get_var("BUILD"))[1]);
-    }
-}
-
 sub get_milestone {
     my $self = shift;
     # FIXME: we don't know how to do this with Pungi 4 yet.
diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index 4690cc52..1197d468 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -44,7 +44,7 @@ sub run {
 
         # REPOSITORY_VARIATION should be set to repository URL without version and architecture
         # appended (it will be appended automatically)
-        $repourl = get_var("REPOSITORY_VARIATION")."/".$self->get_release."/".get_var("ARCH")."/os";
+        $repourl = get_var("REPOSITORY_VARIATION")."/".lc(get_var("VERSION"))."/".get_var("ARCH")."/os";
         type_string " inst.repo=".$repourl;
     }
 
diff --git a/tests/install_source_variation.pm b/tests/install_source_variation.pm
index 4c8092fc..a4c3c0c2 100644
--- a/tests/install_source_variation.pm
+++ b/tests/install_source_variation.pm
@@ -10,7 +10,7 @@ sub run {
 
     my $repourl = "";
 
-    $repourl = get_var("REPOSITORY_VARIATION")."/".$self->get_release."/".get_var("ARCH")."/os";
+    $repourl = get_var("REPOSITORY_VARIATION")."/".lc(get_var("VERSION"))."/".get_var("ARCH")."/os";
 
     # check that the repo was used
     $self->root_console;
diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm
index c0658519..0f54f3cf 100644
--- a/tests/upgrade_run.pm
+++ b/tests/upgrade_run.pm
@@ -4,7 +4,7 @@ use testapi;
 
 sub run {
     my $self = shift;
-    my $release = $self->get_release;
+    my $release = lc(get_var("VERSION"));
     # NOTE: this doesn't actually work yet, it's a FIXME in fedorabase
     my $milestone = $self->get_milestone;
     my $args = "--releasever=${release}";