diff --git a/tests/test_livemediaphase.py b/tests/test_livemediaphase.py
index 0c4b982f..a51c05b2 100755
--- a/tests/test_livemediaphase.py
+++ b/tests/test_livemediaphase.py
@@ -94,12 +94,12 @@ class TestLiveMediaPhase(unittest.TestCase):
                                          'ksversion': None,
                                          'name': 'Fedora Server Live',
                                          'release': None,
-                                         'repo': ['/repo/$arch/Server'],
+                                         'repo': ['/repo/$basearch/Server'],
                                          'scratch': False,
                                          'skip_tag': None,
                                          'target': 'f24',
                                          'title': None,
-                                         'install_tree': '/ostree/$arch/Server',
+                                         'install_tree': '/ostree/$basearch/Server',
                                          'version': 'Rawhide',
                                      }))])
 
@@ -192,13 +192,13 @@ class TestLiveMediaPhase(unittest.TestCase):
                                          'name': 'Fedora Server Live',
                                          'release': '20151203.0',
                                          'repo': ['http://example.com/extra_repo',
-                                                  '/repo/$arch/Everything',
-                                                  '/repo/$arch/Server'],
+                                                  '/repo/$basearch/Everything',
+                                                  '/repo/$basearch/Server'],
                                          'scratch': True,
                                          'skip_tag': True,
                                          'target': 'f24',
                                          'title': 'Custom Title',
-                                         'install_tree': '/ostree/$arch/Everything',
+                                         'install_tree': '/ostree/$basearch/Everything',
                                          'version': 'Rawhide',
                                      }))])
 
@@ -219,7 +219,7 @@ class TestCreateImageBuildThread(unittest.TestCase):
             'ksversion': None,
             'name': 'Fedora Server Live',
             'release': None,
-            'repo': ['/repo/$arch/Server'],
+            'repo': ['/repo/$basearch/Server'],
             'scratch': False,
             'skip_tag': None,
             'target': 'f24',
@@ -269,7 +269,7 @@ class TestCreateImageBuildThread(unittest.TestCase):
                                      'ksversion': None,
                                      'name': 'Fedora Server Live',
                                      'release': None,
-                                     'repo': ['/repo/$arch/Server'],
+                                     'repo': ['/repo/$basearch/Server'],
                                      'scratch': False,
                                      'skip_tag': None,
                                      'target': 'f24',
@@ -320,7 +320,7 @@ class TestCreateImageBuildThread(unittest.TestCase):
             'ksversion': None,
             'name': 'Fedora Server Live',
             'release': None,
-            'repo': ['/repo/$arch/Server'],
+            'repo': ['/repo/$basearch/Server'],
             'scratch': False,
             'skip_tag': None,
             'target': 'f24',
@@ -359,7 +359,7 @@ class TestCreateImageBuildThread(unittest.TestCase):
             'ksversion': None,
             'name': 'Fedora Server Live',
             'release': None,
-            'repo': ['/repo/$arch/Server'],
+            'repo': ['/repo/$basearch/Server'],
             'scratch': False,
             'skip_tag': None,
             'target': 'f24',