diff --git a/libraries/tests/client.py b/libraries/tests/client.py
index 3fc9d39d0..40ca41e0b 100644
--- a/libraries/tests/client.py
+++ b/libraries/tests/client.py
@@ -173,4 +173,8 @@ class EntropyRepositoryTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()
diff --git a/libraries/tests/db.py b/libraries/tests/db.py
index 1f24e4c9a..b59740699 100644
--- a/libraries/tests/db.py
+++ b/libraries/tests/db.py
@@ -352,4 +352,8 @@ class EntropyRepositoryTest(unittest.TestCase):
         self.assertEqual(db_lic_txt, lic_txt)
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()
diff --git a/libraries/tests/qa.py b/libraries/tests/qa.py
index 2cb29a119..eb32d9bbd 100644
--- a/libraries/tests/qa.py
+++ b/libraries/tests/qa.py
@@ -31,4 +31,8 @@ class QATest(unittest.TestCase):
             self.assert_(self.QA.entropy_package_checks(pkg))
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()
diff --git a/libraries/tests/run b/libraries/tests/run
index fb5991dc5..e865a0c54 100755
--- a/libraries/tests/run
+++ b/libraries/tests/run
@@ -12,8 +12,12 @@ sys.path.insert(0,'../../client')
 sys.path.insert(0,'.')
 sys.path.insert(0,'../')
 # set unit testing mode
-from entropy.const import etpSys
+from entropy.const import etpSys, etpUi
 etpSys['unittest'] = True
+if "--debug" in sys.argv:
+    sys.argv.remove("--debug")
+    etpUi['debug'] = True
+
 from tests import db, client, server, misc, transceivers, tools, i18n, spm, qa
 rc = 0
 
diff --git a/libraries/tests/server.py b/libraries/tests/server.py
index d51dc9bee..0962894b8 100644
--- a/libraries/tests/server.py
+++ b/libraries/tests/server.py
@@ -54,4 +54,8 @@ class EntropyRepositoryTest(unittest.TestCase):
         self.assertNotEqual(None, dbconn.retrieveAtom(1))
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()
diff --git a/libraries/tests/spm.py b/libraries/tests/spm.py
index 5e77cc00b..732226af6 100644
--- a/libraries/tests/spm.py
+++ b/libraries/tests/spm.py
@@ -138,4 +138,8 @@ class SpmTest(unittest.TestCase):
         shutil.rmtree(tmp_path, True)
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()
diff --git a/libraries/tests/tools.py b/libraries/tests/tools.py
index 3adad9623..67fa62456 100644
--- a/libraries/tests/tools.py
+++ b/libraries/tests/tools.py
@@ -768,4 +768,8 @@ class ToolsTest(unittest.TestCase):
         shutil.rmtree(tmp_dir)
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()
diff --git a/libraries/tests/transceivers.py b/libraries/tests/transceivers.py
index cdb75c59f..4b415364c 100644
--- a/libraries/tests/transceivers.py
+++ b/libraries/tests/transceivers.py
@@ -54,4 +54,8 @@ class TransceiversTest(unittest.TestCase):
         os.remove(path_to_save)
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()