From 13d61b5c20e2679d6a6c67dd9c728a9b79153fa3 Mon Sep 17 00:00:00 2001
From: smlng <s@mlng.net>
Date: Fri, 10 Aug 2018 11:59:04 +0200
Subject: [PATCH] tests: use testrunner from pythonlibs

Remove now obsolete sys.append from all tests, as testrunner was moved
to dist/pythonlibs as proper package.
---
 tests/bench_msg_pingpong/tests/01-run.py          | 1 -
 tests/bench_mutex_pingpong/tests/01-run.py        | 1 -
 tests/bench_sched_nop/tests/01-run.py             | 1 -
 tests/bench_thread_flags_pingpong/tests/01-run.py | 1 -
 tests/bench_thread_yield_pingpong/tests/01-run.py | 1 -
 tests/bitarithm_timings/tests/01-run.py           | 1 -
 tests/bloom_bytes/tests/01-run.py                 | 1 -
 tests/buttons/tests/01-run.py                     | 1 -
 tests/cb_mux/tests/01-run.py                      | 1 -
 tests/cb_mux_bench/tests/01-run.py                | 1 -
 tests/cbor/tests/01-run.py                        | 1 -
 tests/cpp11_condition_variable/tests/01-run.py    | 1 -
 tests/cpp11_mutex/tests/01-run.py                 | 1 -
 tests/cpp11_thread/tests/01-run.py                | 1 -
 tests/driver_ds1307/tests/01-run.py               | 1 -
 tests/driver_grove_ledbar/tests/01-run.py         | 1 -
 tests/driver_hd44780/tests/01-run.py              | 1 -
 tests/driver_my9221/tests/01-run.py               | 1 -
 tests/events/tests/01-run.py                      | 1 -
 tests/evtimer_msg/tests/01-run.py                 | 1 -
 tests/evtimer_underflow/tests/01-run.py           | 1 -
 tests/float/tests/01-run.py                       | 1 -
 tests/fmt_print/tests/01-run.py                   | 1 -
 tests/gnrc_ipv6_ext/tests/01-run.py               | 1 -
 tests/gnrc_ipv6_nib/tests/01-run.py               | 1 -
 tests/gnrc_ipv6_nib_6ln/tests/01-run.py           | 1 -
 tests/gnrc_ndp/tests/01-run.py                    | 1 -
 tests/gnrc_netif/tests/01-run.py                  | 1 -
 tests/gnrc_sixlowpan/tests/01-run.py              | 1 -
 tests/gnrc_sock_ip/tests/01-run.py                | 1 -
 tests/gnrc_sock_udp/tests/01-run.py               | 1 -
 tests/irq/tests/01-run.py                         | 1 -
 tests/isr_yield_higher/tests/test.py              | 1 -
 tests/libc_newlib/tests/01-run.py                 | 1 -
 tests/libfixmath/tests/01-run.py                  | 1 -
 tests/libfixmath_unittests/tests/01-run.py        | 1 -
 tests/lwip_sock_ip/tests/01-run.py                | 1 -
 tests/lwip_sock_tcp/tests/01-run.py               | 1 -
 tests/lwip_sock_udp/tests/01-run.py               | 1 -
 tests/msg_avail/tests/01-run.py                   | 1 -
 tests/msg_send_receive/tests/01-run.py            | 1 -
 tests/msg_try_receive/tests/01-run.py             | 1 -
 tests/mutex_order/tests/01-run.py                 | 1 -
 tests/mutex_unlock_and_sleep/tests/01-run.py      | 1 -
 tests/netdev_test/tests/01-run.py                 | 1 -
 tests/netstats_l2/tests/01-run.py                 | 1 -
 tests/nhdp/tests/01-run.py                        | 1 -
 tests/od/tests/01-run.py                          | 1 -
 tests/od/tests/02-run.py                          | 1 -
 tests/periph_gpio/tests/02-bench.py               | 1 -
 tests/periph_timer/tests/01-run.py                | 1 -
 tests/pipe/tests/01-run.py                        | 1 -
 tests/pkg_cayenne-lpp/tests/01-run.py             | 1 -
 tests/pkg_fatfs_vfs/tests/01-run.py               | 1 -
 tests/pkg_jsmn/tests/01-run.py                    | 1 -
 tests/pkg_libcoap/tests/01-run.py                 | 1 -
 tests/pkg_micro-ecc-with-hwrng/tests/01-run.py    | 1 -
 tests/pkg_micro-ecc/tests/01-run.py               | 1 -
 tests/pkg_minmea/tests/01-run.py                  | 1 -
 tests/pkg_monocypher/tests/01-run.py              | 2 --
 tests/pkg_tiny-asn1/tests/01-run.py               | 1 -
 tests/pkg_tinycbor/tests/01-run.py                | 1 -
 tests/pkg_tinycrypt/tests/01-run.py               | 1 -
 tests/pkg_u8g2/tests/01-run.py                    | 1 -
 tests/pkg_ucglib/tests/01-run.py                  | 1 -
 tests/pkg_umorse/tests/01-run.py                  | 1 -
 tests/posix_semaphore/tests/01-run.py             | 1 -
 tests/posix_time/tests/01-run.py                  | 1 -
 tests/ps_schedstatistics/tests/01-run.py          | 1 -
 tests/pthread/tests/01-run.py                     | 1 -
 tests/pthread_barrier/tests/01-run.py             | 1 -
 tests/pthread_cleanup/tests/01-run.py             | 1 -
 tests/pthread_condition_variable/tests/01-run.py  | 1 -
 tests/pthread_cooperation/tests/01-run.py         | 1 -
 tests/pthread_rwlock/tests/01-run.py              | 1 -
 tests/pthread_tls/tests/01-run.py                 | 1 -
 tests/rmutex/tests/01-run.py                      | 1 -
 tests/rng/tests/01-run.py                         | 1 -
 tests/sched_testing/tests/01-run.py               | 1 -
 tests/shell/tests/01-run.py                       | 1 -
 tests/sizeof_tcb/tests/01-run.py                  | 1 -
 tests/socket_zep/tests/01-run.py                  | 1 -
 tests/ssp/tests/01-run.py                         | 1 -
 tests/struct_tm_utility/tests/01-run.py           | 1 -
 tests/thread_basic/tests/01-run.py                | 1 -
 tests/thread_cooperation/tests/01-run.py          | 1 -
 tests/thread_exit/tests/01-run.py                 | 1 -
 tests/thread_flags/tests/01-run.py                | 1 -
 tests/thread_flags_xtimer/tests/01-run.py         | 1 -
 tests/thread_flood/tests/01-run.py                | 1 -
 tests/thread_msg/tests/01-run.py                  | 1 -
 tests/thread_msg_block_w_queue/tests/01-run.py    | 1 -
 tests/thread_msg_block_wo_queue/tests/01-run.py   | 1 -
 tests/thread_msg_seq/tests/01-run.py              | 1 -
 tests/thread_race/tests/01-run.py                 | 1 -
 tests/trace/tests/01-run.py                       | 1 -
 tests/trickle/tests/01-run.py                     | 1 -
 tests/unittests/tests/01-run.py                   | 1 -
 tests/xtimer_hang/tests/01-run.py                 | 1 -
 tests/xtimer_msg/tests/01-run.py                  | 1 -
 tests/xtimer_msg_receive_timeout/tests/01-run.py  | 1 -
 tests/xtimer_now64_continuity/tests/01-run.py     | 1 -
 tests/xtimer_periodic_wakeup/tests/01-run.py      | 1 -
 tests/xtimer_remove/tests/01-run.py               | 1 -
 tests/xtimer_reset/tests/01-run.py                | 1 -
 tests/xtimer_usleep/tests/01-run.py               | 1 -
 tests/xtimer_usleep_short/tests/01-run.py         | 1 -
 107 files changed, 108 deletions(-)

diff --git a/tests/bench_msg_pingpong/tests/01-run.py b/tests/bench_msg_pingpong/tests/01-run.py
index 3a1e733980..1e6c34d6fb 100755
--- a/tests/bench_msg_pingpong/tests/01-run.py
+++ b/tests/bench_msg_pingpong/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/bench_mutex_pingpong/tests/01-run.py b/tests/bench_mutex_pingpong/tests/01-run.py
index 3a1e733980..1e6c34d6fb 100755
--- a/tests/bench_mutex_pingpong/tests/01-run.py
+++ b/tests/bench_mutex_pingpong/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/bench_sched_nop/tests/01-run.py b/tests/bench_sched_nop/tests/01-run.py
index 3a1e733980..1e6c34d6fb 100755
--- a/tests/bench_sched_nop/tests/01-run.py
+++ b/tests/bench_sched_nop/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/bench_thread_flags_pingpong/tests/01-run.py b/tests/bench_thread_flags_pingpong/tests/01-run.py
index 3a1e733980..1e6c34d6fb 100755
--- a/tests/bench_thread_flags_pingpong/tests/01-run.py
+++ b/tests/bench_thread_flags_pingpong/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/bench_thread_yield_pingpong/tests/01-run.py b/tests/bench_thread_yield_pingpong/tests/01-run.py
index 3a1e733980..1e6c34d6fb 100755
--- a/tests/bench_thread_yield_pingpong/tests/01-run.py
+++ b/tests/bench_thread_yield_pingpong/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/bitarithm_timings/tests/01-run.py b/tests/bitarithm_timings/tests/01-run.py
index 7e822de870..386d06136f 100755
--- a/tests/bitarithm_timings/tests/01-run.py
+++ b/tests/bitarithm_timings/tests/01-run.py
@@ -19,6 +19,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=30))
diff --git a/tests/bloom_bytes/tests/01-run.py b/tests/bloom_bytes/tests/01-run.py
index 9cbe884e52..699986feba 100755
--- a/tests/bloom_bytes/tests/01-run.py
+++ b/tests/bloom_bytes/tests/01-run.py
@@ -26,6 +26,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/buttons/tests/01-run.py b/tests/buttons/tests/01-run.py
index 7f1b54eb3e..3be148a5a2 100755
--- a/tests/buttons/tests/01-run.py
+++ b/tests/buttons/tests/01-run.py
@@ -22,6 +22,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/cb_mux/tests/01-run.py b/tests/cb_mux/tests/01-run.py
index 969728f79a..0549c9657b 100755
--- a/tests/cb_mux/tests/01-run.py
+++ b/tests/cb_mux/tests/01-run.py
@@ -39,6 +39,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/cb_mux_bench/tests/01-run.py b/tests/cb_mux_bench/tests/01-run.py
index 1f8ac8bcd3..af84928ca2 100755
--- a/tests/cb_mux_bench/tests/01-run.py
+++ b/tests/cb_mux_bench/tests/01-run.py
@@ -20,6 +20,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/cbor/tests/01-run.py b/tests/cbor/tests/01-run.py
index 54705ff527..b420a17e79 100755
--- a/tests/cbor/tests/01-run.py
+++ b/tests/cbor/tests/01-run.py
@@ -50,6 +50,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/cpp11_condition_variable/tests/01-run.py b/tests/cpp11_condition_variable/tests/01-run.py
index 820ecb20f0..158d6e36c6 100755
--- a/tests/cpp11_condition_variable/tests/01-run.py
+++ b/tests/cpp11_condition_variable/tests/01-run.py
@@ -26,6 +26,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/cpp11_mutex/tests/01-run.py b/tests/cpp11_mutex/tests/01-run.py
index 124d65c0d4..3b768c8a22 100755
--- a/tests/cpp11_mutex/tests/01-run.py
+++ b/tests/cpp11_mutex/tests/01-run.py
@@ -22,6 +22,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/cpp11_thread/tests/01-run.py b/tests/cpp11_thread/tests/01-run.py
index dd06462119..c67b01a44d 100755
--- a/tests/cpp11_thread/tests/01-run.py
+++ b/tests/cpp11_thread/tests/01-run.py
@@ -34,6 +34,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/driver_ds1307/tests/01-run.py b/tests/driver_ds1307/tests/01-run.py
index 7c5c67005a..992fa0fca9 100755
--- a/tests/driver_ds1307/tests/01-run.py
+++ b/tests/driver_ds1307/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/driver_grove_ledbar/tests/01-run.py b/tests/driver_grove_ledbar/tests/01-run.py
index c18f59861f..e2be76436b 100755
--- a/tests/driver_grove_ledbar/tests/01-run.py
+++ b/tests/driver_grove_ledbar/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/driver_hd44780/tests/01-run.py b/tests/driver_hd44780/tests/01-run.py
index f1bd3a1e1c..87b126d469 100755
--- a/tests/driver_hd44780/tests/01-run.py
+++ b/tests/driver_hd44780/tests/01-run.py
@@ -17,6 +17,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/driver_my9221/tests/01-run.py b/tests/driver_my9221/tests/01-run.py
index 167e23dcfd..39a482cfe5 100755
--- a/tests/driver_my9221/tests/01-run.py
+++ b/tests/driver_my9221/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/events/tests/01-run.py b/tests/events/tests/01-run.py
index e57631bb79..d1d17996b9 100755
--- a/tests/events/tests/01-run.py
+++ b/tests/events/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/evtimer_msg/tests/01-run.py b/tests/evtimer_msg/tests/01-run.py
index e8523ea80b..3e01c876a7 100755
--- a/tests/evtimer_msg/tests/01-run.py
+++ b/tests/evtimer_msg/tests/01-run.py
@@ -30,6 +30,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/evtimer_underflow/tests/01-run.py b/tests/evtimer_underflow/tests/01-run.py
index 3cfca1775c..7f3ccd72ea 100755
--- a/tests/evtimer_underflow/tests/01-run.py
+++ b/tests/evtimer_underflow/tests/01-run.py
@@ -24,6 +24,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/float/tests/01-run.py b/tests/float/tests/01-run.py
index e1a7498b5e..fa0eb5d053 100755
--- a/tests/float/tests/01-run.py
+++ b/tests/float/tests/01-run.py
@@ -19,6 +19,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/fmt_print/tests/01-run.py b/tests/fmt_print/tests/01-run.py
index 987cbb27e6..558903a8f7 100755
--- a/tests/fmt_print/tests/01-run.py
+++ b/tests/fmt_print/tests/01-run.py
@@ -10,6 +10,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/gnrc_ipv6_ext/tests/01-run.py b/tests/gnrc_ipv6_ext/tests/01-run.py
index 126f844d97..dec27a34ef 100755
--- a/tests/gnrc_ipv6_ext/tests/01-run.py
+++ b/tests/gnrc_ipv6_ext/tests/01-run.py
@@ -39,6 +39,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/gnrc_ipv6_nib/tests/01-run.py b/tests/gnrc_ipv6_nib/tests/01-run.py
index 70f5492ef1..402645aa86 100755
--- a/tests/gnrc_ipv6_nib/tests/01-run.py
+++ b/tests/gnrc_ipv6_nib/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/gnrc_ipv6_nib_6ln/tests/01-run.py b/tests/gnrc_ipv6_nib_6ln/tests/01-run.py
index 70f5492ef1..402645aa86 100755
--- a/tests/gnrc_ipv6_nib_6ln/tests/01-run.py
+++ b/tests/gnrc_ipv6_nib_6ln/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/gnrc_ndp/tests/01-run.py b/tests/gnrc_ndp/tests/01-run.py
index 69bb9c30bc..7b5d5164ff 100755
--- a/tests/gnrc_ndp/tests/01-run.py
+++ b/tests/gnrc_ndp/tests/01-run.py
@@ -17,6 +17,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/gnrc_netif/tests/01-run.py b/tests/gnrc_netif/tests/01-run.py
index 8026b7c1c0..2678e55bfc 100755
--- a/tests/gnrc_netif/tests/01-run.py
+++ b/tests/gnrc_netif/tests/01-run.py
@@ -138,6 +138,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=1, traceback=True))
diff --git a/tests/gnrc_sixlowpan/tests/01-run.py b/tests/gnrc_sixlowpan/tests/01-run.py
index 3ffe189ca0..97df29c958 100755
--- a/tests/gnrc_sixlowpan/tests/01-run.py
+++ b/tests/gnrc_sixlowpan/tests/01-run.py
@@ -76,6 +76,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/gnrc_sock_ip/tests/01-run.py b/tests/gnrc_sock_ip/tests/01-run.py
index f63b0ac9e1..5e730dc9a8 100755
--- a/tests/gnrc_sock_ip/tests/01-run.py
+++ b/tests/gnrc_sock_ip/tests/01-run.py
@@ -49,6 +49,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/gnrc_sock_udp/tests/01-run.py b/tests/gnrc_sock_udp/tests/01-run.py
index fc2af8ab9c..19cf6585d7 100755
--- a/tests/gnrc_sock_udp/tests/01-run.py
+++ b/tests/gnrc_sock_udp/tests/01-run.py
@@ -53,6 +53,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/irq/tests/01-run.py b/tests/irq/tests/01-run.py
index 0d04523406..e6a7407644 100755
--- a/tests/irq/tests/01-run.py
+++ b/tests/irq/tests/01-run.py
@@ -10,6 +10,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/isr_yield_higher/tests/test.py b/tests/isr_yield_higher/tests/test.py
index a3b7dfdaa6..5ff95c57a5 100755
--- a/tests/isr_yield_higher/tests/test.py
+++ b/tests/isr_yield_higher/tests/test.py
@@ -18,6 +18,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/libc_newlib/tests/01-run.py b/tests/libc_newlib/tests/01-run.py
index eeaa7d2c1f..f5a55fd74e 100755
--- a/tests/libc_newlib/tests/01-run.py
+++ b/tests/libc_newlib/tests/01-run.py
@@ -15,6 +15,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/libfixmath/tests/01-run.py b/tests/libfixmath/tests/01-run.py
index 319957db80..fe0e569f83 100755
--- a/tests/libfixmath/tests/01-run.py
+++ b/tests/libfixmath/tests/01-run.py
@@ -39,6 +39,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/libfixmath_unittests/tests/01-run.py b/tests/libfixmath_unittests/tests/01-run.py
index d5c4c49b21..c26be21b75 100755
--- a/tests/libfixmath_unittests/tests/01-run.py
+++ b/tests/libfixmath_unittests/tests/01-run.py
@@ -19,6 +19,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/lwip_sock_ip/tests/01-run.py b/tests/lwip_sock_ip/tests/01-run.py
index 9468d74aa4..efe2b398d9 100755
--- a/tests/lwip_sock_ip/tests/01-run.py
+++ b/tests/lwip_sock_ip/tests/01-run.py
@@ -97,6 +97,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/lwip_sock_tcp/tests/01-run.py b/tests/lwip_sock_tcp/tests/01-run.py
index c28874f56e..2d9fae84db 100755
--- a/tests/lwip_sock_tcp/tests/01-run.py
+++ b/tests/lwip_sock_tcp/tests/01-run.py
@@ -91,6 +91,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=60))
diff --git a/tests/lwip_sock_udp/tests/01-run.py b/tests/lwip_sock_udp/tests/01-run.py
index c9cb4da1f0..5acc81904f 100755
--- a/tests/lwip_sock_udp/tests/01-run.py
+++ b/tests/lwip_sock_udp/tests/01-run.py
@@ -109,6 +109,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/msg_avail/tests/01-run.py b/tests/msg_avail/tests/01-run.py
index e57631bb79..d1d17996b9 100755
--- a/tests/msg_avail/tests/01-run.py
+++ b/tests/msg_avail/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/msg_send_receive/tests/01-run.py b/tests/msg_send_receive/tests/01-run.py
index ae35405b6f..9fc6cd5864 100755
--- a/tests/msg_send_receive/tests/01-run.py
+++ b/tests/msg_send_receive/tests/01-run.py
@@ -15,6 +15,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/msg_try_receive/tests/01-run.py b/tests/msg_try_receive/tests/01-run.py
index d22d0725a5..30fb32ca22 100755
--- a/tests/msg_try_receive/tests/01-run.py
+++ b/tests/msg_try_receive/tests/01-run.py
@@ -10,6 +10,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/mutex_order/tests/01-run.py b/tests/mutex_order/tests/01-run.py
index dfcb36346a..424c9e7a33 100755
--- a/tests/mutex_order/tests/01-run.py
+++ b/tests/mutex_order/tests/01-run.py
@@ -31,6 +31,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/mutex_unlock_and_sleep/tests/01-run.py b/tests/mutex_unlock_and_sleep/tests/01-run.py
index 955095373a..0505ac2c92 100755
--- a/tests/mutex_unlock_and_sleep/tests/01-run.py
+++ b/tests/mutex_unlock_and_sleep/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/netdev_test/tests/01-run.py b/tests/netdev_test/tests/01-run.py
index a1f1a1f765..62ce660e1c 100755
--- a/tests/netdev_test/tests/01-run.py
+++ b/tests/netdev_test/tests/01-run.py
@@ -23,6 +23,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/netstats_l2/tests/01-run.py b/tests/netstats_l2/tests/01-run.py
index 5171e572e8..c0d84e2342 100755
--- a/tests/netstats_l2/tests/01-run.py
+++ b/tests/netstats_l2/tests/01-run.py
@@ -20,6 +20,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/nhdp/tests/01-run.py b/tests/nhdp/tests/01-run.py
index 81f3641451..a0ed853f53 100755
--- a/tests/nhdp/tests/01-run.py
+++ b/tests/nhdp/tests/01-run.py
@@ -15,6 +15,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/od/tests/01-run.py b/tests/od/tests/01-run.py
index 9b3e1674c9..c552865f5d 100755
--- a/tests/od/tests/01-run.py
+++ b/tests/od/tests/01-run.py
@@ -40,6 +40,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=1))
diff --git a/tests/od/tests/02-run.py b/tests/od/tests/02-run.py
index e88f23762d..c28df9ec37 100755
--- a/tests/od/tests/02-run.py
+++ b/tests/od/tests/02-run.py
@@ -40,6 +40,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=1))
diff --git a/tests/periph_gpio/tests/02-bench.py b/tests/periph_gpio/tests/02-bench.py
index a07ac31da8..09ed4e401b 100755
--- a/tests/periph_gpio/tests/02-bench.py
+++ b/tests/periph_gpio/tests/02-bench.py
@@ -33,6 +33,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=10))
diff --git a/tests/periph_timer/tests/01-run.py b/tests/periph_timer/tests/01-run.py
index 8f39997aec..6648eb4ff7 100755
--- a/tests/periph_timer/tests/01-run.py
+++ b/tests/periph_timer/tests/01-run.py
@@ -22,6 +22,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pipe/tests/01-run.py b/tests/pipe/tests/01-run.py
index 8417733703..9623d436e5 100755
--- a/tests/pipe/tests/01-run.py
+++ b/tests/pipe/tests/01-run.py
@@ -30,6 +30,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_cayenne-lpp/tests/01-run.py b/tests/pkg_cayenne-lpp/tests/01-run.py
index 0ba9d6f143..4b99eedb8c 100755
--- a/tests/pkg_cayenne-lpp/tests/01-run.py
+++ b/tests/pkg_cayenne-lpp/tests/01-run.py
@@ -13,6 +13,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_fatfs_vfs/tests/01-run.py b/tests/pkg_fatfs_vfs/tests/01-run.py
index e24f2ce3d3..d1e4987cf8 100755
--- a/tests/pkg_fatfs_vfs/tests/01-run.py
+++ b/tests/pkg_fatfs_vfs/tests/01-run.py
@@ -31,6 +31,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     import testrunner
     sys.exit(testrunner.run(testfunc))
diff --git a/tests/pkg_jsmn/tests/01-run.py b/tests/pkg_jsmn/tests/01-run.py
index 786b43f4ea..9a0bf6b013 100755
--- a/tests/pkg_jsmn/tests/01-run.py
+++ b/tests/pkg_jsmn/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_libcoap/tests/01-run.py b/tests/pkg_libcoap/tests/01-run.py
index 0978437c60..657ff07365 100755
--- a/tests/pkg_libcoap/tests/01-run.py
+++ b/tests/pkg_libcoap/tests/01-run.py
@@ -9,6 +9,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_micro-ecc-with-hwrng/tests/01-run.py b/tests/pkg_micro-ecc-with-hwrng/tests/01-run.py
index 825e260a54..7167faa9c7 100755
--- a/tests/pkg_micro-ecc-with-hwrng/tests/01-run.py
+++ b/tests/pkg_micro-ecc-with-hwrng/tests/01-run.py
@@ -13,6 +13,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=60))
diff --git a/tests/pkg_micro-ecc/tests/01-run.py b/tests/pkg_micro-ecc/tests/01-run.py
index 997b3b8e8e..88ffb443ac 100755
--- a/tests/pkg_micro-ecc/tests/01-run.py
+++ b/tests/pkg_micro-ecc/tests/01-run.py
@@ -13,6 +13,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=60))
diff --git a/tests/pkg_minmea/tests/01-run.py b/tests/pkg_minmea/tests/01-run.py
index 84d36144ef..af4b043ffd 100755
--- a/tests/pkg_minmea/tests/01-run.py
+++ b/tests/pkg_minmea/tests/01-run.py
@@ -10,6 +10,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_monocypher/tests/01-run.py b/tests/pkg_monocypher/tests/01-run.py
index d90541ef39..7e0ce7ad4c 100755
--- a/tests/pkg_monocypher/tests/01-run.py
+++ b/tests/pkg_monocypher/tests/01-run.py
@@ -16,7 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTBASE'],
-                                 'dist/tools/testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_tiny-asn1/tests/01-run.py b/tests/pkg_tiny-asn1/tests/01-run.py
index c52f61ed0d..06d979766a 100755
--- a/tests/pkg_tiny-asn1/tests/01-run.py
+++ b/tests/pkg_tiny-asn1/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_tinycbor/tests/01-run.py b/tests/pkg_tinycbor/tests/01-run.py
index 05dcbec1d2..7b39d74443 100755
--- a/tests/pkg_tinycbor/tests/01-run.py
+++ b/tests/pkg_tinycbor/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_tinycrypt/tests/01-run.py b/tests/pkg_tinycrypt/tests/01-run.py
index 7534d42721..4e1df03e2d 100755
--- a/tests/pkg_tinycrypt/tests/01-run.py
+++ b/tests/pkg_tinycrypt/tests/01-run.py
@@ -15,6 +15,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_u8g2/tests/01-run.py b/tests/pkg_u8g2/tests/01-run.py
index 0db138076c..796072098d 100755
--- a/tests/pkg_u8g2/tests/01-run.py
+++ b/tests/pkg_u8g2/tests/01-run.py
@@ -125,6 +125,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_ucglib/tests/01-run.py b/tests/pkg_ucglib/tests/01-run.py
index 746ef8b5f8..2d7aa38066 100755
--- a/tests/pkg_ucglib/tests/01-run.py
+++ b/tests/pkg_ucglib/tests/01-run.py
@@ -61,6 +61,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pkg_umorse/tests/01-run.py b/tests/pkg_umorse/tests/01-run.py
index 13ef30da4b..550cda48d6 100755
--- a/tests/pkg_umorse/tests/01-run.py
+++ b/tests/pkg_umorse/tests/01-run.py
@@ -21,6 +21,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/posix_semaphore/tests/01-run.py b/tests/posix_semaphore/tests/01-run.py
index b3236d29e6..05d1154cc3 100755
--- a/tests/posix_semaphore/tests/01-run.py
+++ b/tests/posix_semaphore/tests/01-run.py
@@ -98,6 +98,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/posix_time/tests/01-run.py b/tests/posix_time/tests/01-run.py
index 875544d186..4d38bed1d9 100755
--- a/tests/posix_time/tests/01-run.py
+++ b/tests/posix_time/tests/01-run.py
@@ -46,6 +46,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/ps_schedstatistics/tests/01-run.py b/tests/ps_schedstatistics/tests/01-run.py
index b755f6ad84..751117e39a 100755
--- a/tests/ps_schedstatistics/tests/01-run.py
+++ b/tests/ps_schedstatistics/tests/01-run.py
@@ -62,6 +62,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pthread/tests/01-run.py b/tests/pthread/tests/01-run.py
index 669b6e49f3..cf846ad84e 100755
--- a/tests/pthread/tests/01-run.py
+++ b/tests/pthread/tests/01-run.py
@@ -18,6 +18,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pthread_barrier/tests/01-run.py b/tests/pthread_barrier/tests/01-run.py
index 322180207c..ef724c76bf 100755
--- a/tests/pthread_barrier/tests/01-run.py
+++ b/tests/pthread_barrier/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pthread_cleanup/tests/01-run.py b/tests/pthread_cleanup/tests/01-run.py
index cbb843781f..31380dbf98 100755
--- a/tests/pthread_cleanup/tests/01-run.py
+++ b/tests/pthread_cleanup/tests/01-run.py
@@ -20,6 +20,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pthread_condition_variable/tests/01-run.py b/tests/pthread_condition_variable/tests/01-run.py
index 1451820944..efbc17d830 100755
--- a/tests/pthread_condition_variable/tests/01-run.py
+++ b/tests/pthread_condition_variable/tests/01-run.py
@@ -13,6 +13,5 @@ def testfunc(child):
 if __name__ == "__main__":
     # This test can take some time to complete when testing on hardware (e.g
     # on samr21-xpro) and the default timeout (10s) is not enough.
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=60))
diff --git a/tests/pthread_cooperation/tests/01-run.py b/tests/pthread_cooperation/tests/01-run.py
index b950186a08..56ee6e0eee 100755
--- a/tests/pthread_cooperation/tests/01-run.py
+++ b/tests/pthread_cooperation/tests/01-run.py
@@ -17,6 +17,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pthread_rwlock/tests/01-run.py b/tests/pthread_rwlock/tests/01-run.py
index 02a3010364..414c8b52c6 100755
--- a/tests/pthread_rwlock/tests/01-run.py
+++ b/tests/pthread_rwlock/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/pthread_tls/tests/01-run.py b/tests/pthread_tls/tests/01-run.py
index d25f2c5676..b21fb14666 100755
--- a/tests/pthread_tls/tests/01-run.py
+++ b/tests/pthread_tls/tests/01-run.py
@@ -36,6 +36,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/rmutex/tests/01-run.py b/tests/rmutex/tests/01-run.py
index f4b89d0295..17cacc1129 100755
--- a/tests/rmutex/tests/01-run.py
+++ b/tests/rmutex/tests/01-run.py
@@ -45,6 +45,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/rng/tests/01-run.py b/tests/rng/tests/01-run.py
index e8573f535e..fc41328cbe 100755
--- a/tests/rng/tests/01-run.py
+++ b/tests/rng/tests/01-run.py
@@ -66,6 +66,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ["RIOTTOOLS"], "testrunner"))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/sched_testing/tests/01-run.py b/tests/sched_testing/tests/01-run.py
index 808de540db..8bb0239ccb 100755
--- a/tests/sched_testing/tests/01-run.py
+++ b/tests/sched_testing/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/shell/tests/01-run.py b/tests/shell/tests/01-run.py
index 52d187b8fb..cd5fabcd93 100755
--- a/tests/shell/tests/01-run.py
+++ b/tests/shell/tests/01-run.py
@@ -56,6 +56,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/sizeof_tcb/tests/01-run.py b/tests/sizeof_tcb/tests/01-run.py
index 587a51d977..6c754b72d7 100755
--- a/tests/sizeof_tcb/tests/01-run.py
+++ b/tests/sizeof_tcb/tests/01-run.py
@@ -39,6 +39,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/socket_zep/tests/01-run.py b/tests/socket_zep/tests/01-run.py
index f1eb831faa..deaa1148e8 100755
--- a/tests/socket_zep/tests/01-run.py
+++ b/tests/socket_zep/tests/01-run.py
@@ -53,7 +53,6 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     import testrunner
 
     os.environ['TERMFLAGS'] = "-z [%s]:%d,[%s]:%d" % (
diff --git a/tests/ssp/tests/01-run.py b/tests/ssp/tests/01-run.py
index d1975224a7..868eb03418 100755
--- a/tests/ssp/tests/01-run.py
+++ b/tests/ssp/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/struct_tm_utility/tests/01-run.py b/tests/struct_tm_utility/tests/01-run.py
index 4c157cb8c9..8bd04d94ac 100755
--- a/tests/struct_tm_utility/tests/01-run.py
+++ b/tests/struct_tm_utility/tests/01-run.py
@@ -120,6 +120,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_basic/tests/01-run.py b/tests/thread_basic/tests/01-run.py
index 99ca62c51c..2864a30f46 100755
--- a/tests/thread_basic/tests/01-run.py
+++ b/tests/thread_basic/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_cooperation/tests/01-run.py b/tests/thread_cooperation/tests/01-run.py
index 1ded975d80..a7728af7d9 100755
--- a/tests/thread_cooperation/tests/01-run.py
+++ b/tests/thread_cooperation/tests/01-run.py
@@ -18,6 +18,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_exit/tests/01-run.py b/tests/thread_exit/tests/01-run.py
index 51a8386d4f..432b4c99e0 100755
--- a/tests/thread_exit/tests/01-run.py
+++ b/tests/thread_exit/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_flags/tests/01-run.py b/tests/thread_flags/tests/01-run.py
index 0aa62a45be..38c978b5c2 100755
--- a/tests/thread_flags/tests/01-run.py
+++ b/tests/thread_flags/tests/01-run.py
@@ -28,6 +28,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_flags_xtimer/tests/01-run.py b/tests/thread_flags_xtimer/tests/01-run.py
index b89b97b350..004984efd7 100755
--- a/tests/thread_flags_xtimer/tests/01-run.py
+++ b/tests/thread_flags_xtimer/tests/01-run.py
@@ -12,6 +12,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_flood/tests/01-run.py b/tests/thread_flood/tests/01-run.py
index 00b61693d9..97c0dd1435 100755
--- a/tests/thread_flood/tests/01-run.py
+++ b/tests/thread_flood/tests/01-run.py
@@ -11,6 +11,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_msg/tests/01-run.py b/tests/thread_msg/tests/01-run.py
index 219edb2424..be06a8afca 100755
--- a/tests/thread_msg/tests/01-run.py
+++ b/tests/thread_msg/tests/01-run.py
@@ -14,6 +14,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_msg_block_w_queue/tests/01-run.py b/tests/thread_msg_block_w_queue/tests/01-run.py
index 4e6aeb289d..190c8d5cba 100755
--- a/tests/thread_msg_block_w_queue/tests/01-run.py
+++ b/tests/thread_msg_block_w_queue/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_msg_block_wo_queue/tests/01-run.py b/tests/thread_msg_block_wo_queue/tests/01-run.py
index 4e6aeb289d..190c8d5cba 100755
--- a/tests/thread_msg_block_wo_queue/tests/01-run.py
+++ b/tests/thread_msg_block_wo_queue/tests/01-run.py
@@ -16,6 +16,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_msg_seq/tests/01-run.py b/tests/thread_msg_seq/tests/01-run.py
index e254d99b56..f479800f60 100755
--- a/tests/thread_msg_seq/tests/01-run.py
+++ b/tests/thread_msg_seq/tests/01-run.py
@@ -20,6 +20,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/thread_race/tests/01-run.py b/tests/thread_race/tests/01-run.py
index 33bc6ecaa0..9768048891 100755
--- a/tests/thread_race/tests/01-run.py
+++ b/tests/thread_race/tests/01-run.py
@@ -21,6 +21,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/trace/tests/01-run.py b/tests/trace/tests/01-run.py
index 8321cafd6e..158a583a2b 100755
--- a/tests/trace/tests/01-run.py
+++ b/tests/trace/tests/01-run.py
@@ -20,6 +20,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     import testrunner
     sys.exit(testrunner.run(testfunc, timeout=1, echo=True, traceback=True))
diff --git a/tests/trickle/tests/01-run.py b/tests/trickle/tests/01-run.py
index e3625e112a..963f7c04a4 100755
--- a/tests/trickle/tests/01-run.py
+++ b/tests/trickle/tests/01-run.py
@@ -25,6 +25,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/unittests/tests/01-run.py b/tests/unittests/tests/01-run.py
index 9559c2e076..56f8975f8e 100755
--- a/tests/unittests/tests/01-run.py
+++ b/tests/unittests/tests/01-run.py
@@ -15,6 +15,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc, timeout=120))
diff --git a/tests/xtimer_hang/tests/01-run.py b/tests/xtimer_hang/tests/01-run.py
index 8b314e399e..765ebf5ba4 100755
--- a/tests/xtimer_hang/tests/01-run.py
+++ b/tests/xtimer_hang/tests/01-run.py
@@ -22,6 +22,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/xtimer_msg/tests/01-run.py b/tests/xtimer_msg/tests/01-run.py
index 8fd6388577..9426896d22 100755
--- a/tests/xtimer_msg/tests/01-run.py
+++ b/tests/xtimer_msg/tests/01-run.py
@@ -27,6 +27,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/xtimer_msg_receive_timeout/tests/01-run.py b/tests/xtimer_msg_receive_timeout/tests/01-run.py
index 6c8d8492f7..96f7bb5268 100755
--- a/tests/xtimer_msg_receive_timeout/tests/01-run.py
+++ b/tests/xtimer_msg_receive_timeout/tests/01-run.py
@@ -19,6 +19,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/xtimer_now64_continuity/tests/01-run.py b/tests/xtimer_now64_continuity/tests/01-run.py
index 32181ec435..f4e9a5e08b 100755
--- a/tests/xtimer_now64_continuity/tests/01-run.py
+++ b/tests/xtimer_now64_continuity/tests/01-run.py
@@ -17,6 +17,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/xtimer_periodic_wakeup/tests/01-run.py b/tests/xtimer_periodic_wakeup/tests/01-run.py
index 2da5521fdb..e6d052b3c6 100755
--- a/tests/xtimer_periodic_wakeup/tests/01-run.py
+++ b/tests/xtimer_periodic_wakeup/tests/01-run.py
@@ -23,6 +23,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/xtimer_remove/tests/01-run.py b/tests/xtimer_remove/tests/01-run.py
index 119b465970..ee0fa4fd41 100755
--- a/tests/xtimer_remove/tests/01-run.py
+++ b/tests/xtimer_remove/tests/01-run.py
@@ -25,6 +25,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/xtimer_reset/tests/01-run.py b/tests/xtimer_reset/tests/01-run.py
index f957546b08..67bb037a43 100755
--- a/tests/xtimer_reset/tests/01-run.py
+++ b/tests/xtimer_reset/tests/01-run.py
@@ -21,6 +21,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/xtimer_usleep/tests/01-run.py b/tests/xtimer_usleep/tests/01-run.py
index 670f8da852..b72f052b1e 100755
--- a/tests/xtimer_usleep/tests/01-run.py
+++ b/tests/xtimer_usleep/tests/01-run.py
@@ -57,6 +57,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
diff --git a/tests/xtimer_usleep_short/tests/01-run.py b/tests/xtimer_usleep_short/tests/01-run.py
index 3e7790a922..86a0038eff 100755
--- a/tests/xtimer_usleep_short/tests/01-run.py
+++ b/tests/xtimer_usleep_short/tests/01-run.py
@@ -29,6 +29,5 @@ def testfunc(child):
 
 
 if __name__ == "__main__":
-    sys.path.append(os.path.join(os.environ['RIOTTOOLS'], 'testrunner'))
     from testrunner import run
     sys.exit(run(testfunc))
-- 
GitLab