diff --git a/system/t08_db/CleanupDB9Test_publish_drop b/system/t08_db/CleanupDB9Test_publish_drop
index af8e41e1..c9303809 100644
--- a/system/t08_db/CleanupDB9Test_publish_drop
+++ b/system/t08_db/CleanupDB9Test_publish_drop
@@ -1,4 +1,4 @@
-Removing /Users/smira/.aptly/public/dists/def...
+Removing ${HOME}/.aptly/public/dists/def...
 Cleaning up prefix "." components main...
 
 Published repository has been removed successfully.
diff --git a/system/t08_db/cleanup.py b/system/t08_db/cleanup.py
index 888e5314..908cb25d 100644
--- a/system/t08_db/cleanup.py
+++ b/system/t08_db/cleanup.py
@@ -110,4 +110,4 @@ class CleanupDB9Test(BaseTest):
 
     def check(self):
             self.check_output()
-            self.check_cmd_output("aptly publish drop def", "publish_drop")
+            self.check_cmd_output("aptly publish drop def", "publish_drop", match_prepare=self.expand_environ)