Index: tests/pybin/settings.py
===================================================================
--- tests/pybin/settings.py	(revision 136f86b8d410dcce05db552ea01f4f4caa406aab)
+++ tests/pybin/settings.py	(revision b5276fc0b3d3273fe346bced7142fb30d25226d1)
@@ -23,15 +23,15 @@
 class Architecture:
 	KnownArchitectures = {
-		'x64'		: 'x64',
-		'x86-64'	: 'x64',
-		'x86_64'	: 'x64',
-		'x86'		: 'x86',
-		'aarch64'	: 'arm',
-		'i386'		: 'x86',
-		'i486'		: 'x86',
-		'i686'		: 'x86',
-		'Intel 80386'	: 'x86',
-		'arm'		: 'arm',
-		'ARM'		: 'arm',
+		'x64'         : 'x64',
+		'x86-64'      : 'x64',
+		'x86_64'      : 'x64',
+		'x86'         : 'x86',
+		'aarch64'     : 'arm',
+		'i386'        : 'x86',
+		'i486'        : 'x86',
+		'i686'        : 'x86',
+		'Intel 80386' : 'x86',
+		'arm'         : 'arm',
+		'ARM'         : 'arm',
 	}
 
@@ -129,5 +129,5 @@
 	global timeout2gdb
 
-	all_arch     = [Architecture(o) for o in list(dict.fromkeys(options.arch   ))]
+	all_arch     = [Architecture(o) for o in list(dict.fromkeys(options.arch   ))] if options.arch else [Architecture(None)]
 	all_debug    = [Debug(o)        for o in list(dict.fromkeys(options.debug  ))]
 	all_install  = [Install(o)      for o in list(dict.fromkeys(options.install))]
Index: tests/pybin/test_run.py
===================================================================
--- tests/pybin/test_run.py	(revision 136f86b8d410dcce05db552ea01f4f4caa406aab)
+++ tests/pybin/test_run.py	(revision b5276fc0b3d3273fe346bced7142fb30d25226d1)
@@ -45,9 +45,9 @@
 
 	@classmethod
-	def from_target(_, target):
+	def new_target(_, target, arch):
 		test = Test()
 		test.name = os.path.basename(target)
 		test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
-		test.arch = settings.arch.target if settings.arch.cross_compile else ''
+		test.arch = arch.target if arch else ''
 		return test