diff --git a/tests/run-tests b/tests/run-tests
index 85bf372fce66229e45c24111f414b5903dc1626a..7df956313748d3fe95042de98efa3eb27956190d 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -188,9 +188,12 @@ def run_tests(pyb, tests, args):
 
     # Some tests shouldn't be run on pyboard
     if pyb is not None:
+        skip_tests.add('basics/exception_chain.py') # warning is not printed
         skip_tests.add('float/float_divmod.py') # tested by float/float_divmod_relaxed.py instead
         skip_tests.add('float/float2int_doubleprec.py') # requires double precision floating point to work
         skip_tests.add('micropython/meminfo.py') # output is very different to PC output
+        skip_tests.add('extmod/machine1.py') # raw memory access not supported
+        skip_tests.add('extmod/machine_mem.py') # raw memory access not supported
 
         if args.target == 'wipy':
             skip_tests.add('misc/print_exception.py')       # requires error reporting full
@@ -202,10 +205,7 @@ def run_tests(pyb, tests, args):
             skip_tests.add('extmod/zlibd_decompress.py')    # requires zlib
             skip_tests.add('extmod/ujson_dumps_float.py')   # requires floating point
             skip_tests.add('extmod/ujson_loads_float.py')   # requires floating point
-            skip_tests.add('extmod/machine1.py')            # raw memory access not supported by WiPy
-            skip_tests.add('extmod/machine_mem.py')         # raw memory access not supported by WiPy
             skip_tests.add('extmod/uheapq1.py')             # uheapq not supported by WiPy
-            skip_tests.add('basics/exception_chain.py')     # warning is not printed
 
     # Some tests are known to fail on 64-bit machines
     if pyb is None and platform.architecture()[0] == '64bit':