diff --git a/teuthology/task/calamari.py b/teuthology/task/calamari.py
index 845056eb01e..6d93dd2d20f 100644
--- a/teuthology/task/calamari.py
+++ b/teuthology/task/calamari.py
@@ -141,7 +141,7 @@ def _install_repo(remote, pkgdir, username, password):
                          '-y'])
         result = remote.run(args=['sudo', 'apt-get', 'update', '-y'],
                             stdout=StringIO())
-        return True
+        return result
 
     elif relmap['flavor'] == 'rpm':
         baseurl = 'https://{username}:{password}@download.inktank.com/' \
@@ -175,7 +175,7 @@ def _remove_repo(remote):
                                sudo=True, force=True)
         result = remote.run(args=['sudo', 'apt-get', 'update', '-y'],
                             stdout=StringIO())
-        return True
+        return result
 
     elif flavor == 'rpm':
         teuthology.delete_file(remote, '/etc/yum.repos.d/inktank.repo',
diff --git a/teuthology/task/calamari_testdir/test_server_1_0.py b/teuthology/task/calamari_testdir/servertest_1_0.py
similarity index 100%
rename from teuthology/task/calamari_testdir/test_server_1_0.py
rename to teuthology/task/calamari_testdir/servertest_1_0.py