diff --git a/lib/tests/client.py b/lib/tests/client.py
index 45447931f..8cebd8e3e 100644
--- a/lib/tests/client.py
+++ b/lib/tests/client.py
@@ -373,11 +373,6 @@ else:
 
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
-
diff --git a/lib/tests/const.py b/lib/tests/const.py
index a5f19c0d7..5f7315b1d 100644
--- a/lib/tests/const.py
+++ b/lib/tests/const.py
@@ -46,10 +46,6 @@ class ConstTest(unittest.TestCase):
         self.assertTrue(os.getgid() == 0)
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/core.py b/lib/tests/core.py
index 6c1d36318..9bd55c62e 100644
--- a/lib/tests/core.py
+++ b/lib/tests/core.py
@@ -56,10 +56,6 @@ class CoreTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/db.py b/lib/tests/db.py
index 98162d70d..10774b01e 100644
--- a/lib/tests/db.py
+++ b/lib/tests/db.py
@@ -928,10 +928,6 @@ class EntropyRepositoryTest(unittest.TestCase):
         test_db.close()
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/dep.py b/lib/tests/dep.py
index 3a83f456a..869664df0 100644
--- a/lib/tests/dep.py
+++ b/lib/tests/dep.py
@@ -235,10 +235,6 @@ class DepTest(unittest.TestCase):
             self.assertEqual(outcome, expected_outcome)
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     et.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/fetchers.py b/lib/tests/fetchers.py
index 65078d286..23cd0c2c1 100644
--- a/lib/tests/fetchers.py
+++ b/lib/tests/fetchers.py
@@ -57,10 +57,6 @@ class FetchersTest(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()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/i18n.py b/lib/tests/i18n.py
index 6fed1092a..cc9c0da93 100644
--- a/lib/tests/i18n.py
+++ b/lib/tests/i18n.py
@@ -110,10 +110,6 @@ class MiscTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/misc.py b/lib/tests/misc.py
index 0d9a523af..22fa14fa5 100644
--- a/lib/tests/misc.py
+++ b/lib/tests/misc.py
@@ -291,10 +291,6 @@ class MiscTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/qa.py b/lib/tests/qa.py
index c8ed865c1..95c8fe6e4 100644
--- a/lib/tests/qa.py
+++ b/lib/tests/qa.py
@@ -34,10 +34,6 @@ class QATest(unittest.TestCase):
             self.assertTrue(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()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/run b/lib/tests/run
index 628e6ce91..b2c19331c 100755
--- a/lib/tests/run
+++ b/lib/tests/run
@@ -15,9 +15,6 @@ sys.path.insert(0,'../')
 from entropy.const import etpSys, etpUi
 import entropy.tools
 etpSys['unittest'] = True
-if "--debug" in sys.argv:
-    sys.argv.remove("--debug")
-    etpUi['debug'] = True
 
 from tests import db, client, server, misc, fetchers, tools, dep, i18n, spm, \
     qa, core, security, const
diff --git a/lib/tests/security.py b/lib/tests/security.py
index 8e0334143..18a3ac266 100644
--- a/lib/tests/security.py
+++ b/lib/tests/security.py
@@ -127,10 +127,6 @@ class SecurityTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/server.py b/lib/tests/server.py
index 7c66ef1ae..0e19d1ba4 100644
--- a/lib/tests/server.py
+++ b/lib/tests/server.py
@@ -164,10 +164,6 @@ class EntropyRepositoryTest(unittest.TestCase):
         self.assertEqual(None, etpConst.get(const_key))
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/spm.py b/lib/tests/spm.py
index 8b183146a..bb04441f8 100644
--- a/lib/tests/spm.py
+++ b/lib/tests/spm.py
@@ -265,10 +265,6 @@ class SpmTest(unittest.TestCase):
             del os.environ['ETP_PORTAGE_CONDITIONAL_DEPS_ENABLE']
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     et.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/standalone/repo_webserv.py b/lib/tests/standalone/repo_webserv.py
index 03fa6d9ee..0d2df82b3 100644
--- a/lib/tests/standalone/repo_webserv.py
+++ b/lib/tests/standalone/repo_webserv.py
@@ -10,7 +10,7 @@ from entropy.client.interfaces import Client
 from entropy.services.client import WebService
 from entropy.client.services.interfaces import Document, DocumentFactory, \
     DocumentList, ClientWebService
-from entropy.const import etpConst, etpUi, const_convert_to_rawstring, \
+from entropy.const import etpConst, const_convert_to_rawstring, \
     const_convert_to_unicode, const_get_stringtype
 import entropy.tools
 import tests._misc as _misc
@@ -125,10 +125,6 @@ class EntropyWebServicesTest(unittest.TestCase):
         test_repo.close()
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/standalone/webserv.py b/lib/tests/standalone/webserv.py
index 02cd969dd..33487ee22 100644
--- a/lib/tests/standalone/webserv.py
+++ b/lib/tests/standalone/webserv.py
@@ -10,7 +10,7 @@ from entropy.client.interfaces import Client
 from entropy.services.client import WebService
 from entropy.client.services.interfaces import Document, DocumentFactory, \
     DocumentList, ClientWebService
-from entropy.const import etpConst, etpUi, const_convert_to_rawstring, \
+from entropy.const import etpConst, const_convert_to_rawstring, \
     const_convert_to_unicode, const_get_stringtype
 import entropy.tools
 import tests._misc as _misc
@@ -982,10 +982,6 @@ class EntropyWebServicesTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
     raise SystemExit(0)
diff --git a/lib/tests/tools.py b/lib/tests/tools.py
index fc64ff0c9..2a14a39cf 100644
--- a/lib/tests/tools.py
+++ b/lib/tests/tools.py
@@ -574,10 +574,6 @@ class ToolsTest(unittest.TestCase):
         self.assertEqual(path_perms, new_path_perms)
 
 if __name__ == '__main__':
-    if "--debug" in sys.argv:
-        sys.argv.remove("--debug")
-        from entropy.const import etpUi
-        etpUi['debug'] = True
     unittest.main()
     et.kill_threads()
     raise SystemExit(0)