diff --git a/libraries/tests/db.py b/libraries/tests/db.py
index 605da79ed..0d77da5c1 100644
--- a/libraries/tests/db.py
+++ b/libraries/tests/db.py
@@ -20,12 +20,6 @@ import entropy.tools
 class EntropyRepositoryTest(unittest.TestCase):
 
     def setUp(self):
-        # since package files have been produced on amd64, add the same
-        # arch to etpConst['keywords'] to avoid atomMatch failures on x86
-        # and arm/other arches.
-        self._original_keywords = etpConst['keywords'].copy()
-        etpConst['keywords'].add("~amd64")
-        etpConst['keywords'].add("amd64")
         sys.stdout.write("%s called\n" % (self,))
         sys.stdout.flush()
         self.Client = Client(installed_repo = -1, indexing = False,
@@ -41,6 +35,12 @@ class EntropyRepositoryTest(unittest.TestCase):
         # GenericRepository supports package masking if this property is set
         self.test_db2.enable_mask_filter = True
         self._settings = SystemSettings()
+        # since package files have been produced on amd64, add the same
+        # arch to etpConst['keywords'] to avoid atomMatch failures on x86
+        # and arm/other arches.
+        self._original_keywords = etpConst['keywords'].copy()
+        etpConst['keywords'].add("~amd64")
+        etpConst['keywords'].add("amd64")
 
     def tearDown(self):
         """