diff --git a/tests/__init__.py b/tests/__init__.py
index 46d3769..4c26c7b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -78,7 +78,7 @@ class TestData:
         assert (name not in self.added_binaries[unstable])
         self.added_binaries[unstable].add(name)
 
-        fields.setdefault('Architecture', architectures[0])
+        fields.setdefault('Architecture', 'all')
         fields.setdefault('Version', '1')
         fields.setdefault('Priority', 'optional')
         fields.setdefault('Section', 'devel')
diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py
index eb8d8d9..a5bace8 100755
--- a/tests/test_autopkgtest.py
+++ b/tests/test_autopkgtest.py
@@ -59,7 +59,6 @@ class TestAutoPkgTest(TestBase):
         self.data.add('blue', False, {'Depends': 'libc6 (>= 0.9)',
                                       'Conflicts': 'green'},
                       testsuite='specialtest')
-        self.data.add('justdata', False, {'Architecture': 'all'})
 
         # create mock Swift server (but don't start it yet, as tests first need
         # to poke in results)