diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a5db13c9..75a5e377 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,7 @@ lib_xua Change Log
 -----
 
   * CHANGED:   Move HID descriptors to ease maintenance
+  * CHANGED:   Move legacy tests to separate directory
 
 1.2.0
 -----
diff --git a/Jenkinsfile b/Jenkinsfile
index 092948c7..ef501285 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,8 +28,13 @@ pipeline {
           }
         }
         stage('Tests') {
-          steps {
-            runXmostest("${REPO}", 'tests')
+          failFast true
+          parallel {
+            stage('Legacy tests') {
+              steps {
+                runXmostest("${REPO}", 'legacy_tests')
+              }
+            }
           }
         }
         stage('xCORE builds') {
diff --git a/tests/app_test_i2s_loopback/Makefile b/legacy_tests/app_test_i2s_loopback/Makefile
similarity index 100%
rename from tests/app_test_i2s_loopback/Makefile
rename to legacy_tests/app_test_i2s_loopback/Makefile
diff --git a/tests/app_test_i2s_loopback/debug_conf.h b/legacy_tests/app_test_i2s_loopback/debug_conf.h
similarity index 100%
rename from tests/app_test_i2s_loopback/debug_conf.h
rename to legacy_tests/app_test_i2s_loopback/debug_conf.h
diff --git a/tests/app_test_i2s_loopback/main.xc b/legacy_tests/app_test_i2s_loopback/main.xc
similarity index 100%
rename from tests/app_test_i2s_loopback/main.xc
rename to legacy_tests/app_test_i2s_loopback/main.xc
diff --git a/tests/app_test_i2s_loopback/simulation.xc b/legacy_tests/app_test_i2s_loopback/simulation.xc
similarity index 100%
rename from tests/app_test_i2s_loopback/simulation.xc
rename to legacy_tests/app_test_i2s_loopback/simulation.xc
diff --git a/tests/app_test_i2s_loopback/usb_device.h b/legacy_tests/app_test_i2s_loopback/usb_device.h
similarity index 100%
rename from tests/app_test_i2s_loopback/usb_device.h
rename to legacy_tests/app_test_i2s_loopback/usb_device.h
diff --git a/tests/app_test_i2s_loopback/usb_device.xc b/legacy_tests/app_test_i2s_loopback/usb_device.xc
similarity index 100%
rename from tests/app_test_i2s_loopback/usb_device.xc
rename to legacy_tests/app_test_i2s_loopback/usb_device.xc
diff --git a/tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc b/legacy_tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc
similarity index 100%
rename from tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc
rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/audiohw.xc
diff --git a/tests/app_test_i2s_loopback/xk_216_mc/cs2100.h b/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs2100.h
similarity index 100%
rename from tests/app_test_i2s_loopback/xk_216_mc/cs2100.h
rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/cs2100.h
diff --git a/tests/app_test_i2s_loopback/xk_216_mc/cs4384.h b/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs4384.h
similarity index 100%
rename from tests/app_test_i2s_loopback/xk_216_mc/cs4384.h
rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/cs4384.h
diff --git a/tests/app_test_i2s_loopback/xk_216_mc/cs5368.h b/legacy_tests/app_test_i2s_loopback/xk_216_mc/cs5368.h
similarity index 100%
rename from tests/app_test_i2s_loopback/xk_216_mc/cs5368.h
rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/cs5368.h
diff --git a/tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c b/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c
similarity index 100%
rename from tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c
rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.c
diff --git a/tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h b/legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h
similarity index 100%
rename from tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h
rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/gpio_access.h
diff --git a/tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn b/legacy_tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn
similarity index 100%
rename from tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn
rename to legacy_tests/app_test_i2s_loopback/xk_216_mc/xk-audio-216-mc.xn
diff --git a/tests/app_test_i2s_loopback/xua_conf.h b/legacy_tests/app_test_i2s_loopback/xua_conf.h
similarity index 100%
rename from tests/app_test_i2s_loopback/xua_conf.h
rename to legacy_tests/app_test_i2s_loopback/xua_conf.h
diff --git a/tests/pass.expect b/legacy_tests/pass.expect
similarity index 100%
rename from tests/pass.expect
rename to legacy_tests/pass.expect
diff --git a/tests/runtests.py b/legacy_tests/runtests.py
similarity index 100%
rename from tests/runtests.py
rename to legacy_tests/runtests.py
diff --git a/tests/test_i2s_loopback.py b/legacy_tests/test_i2s_loopback.py
similarity index 100%
rename from tests/test_i2s_loopback.py
rename to legacy_tests/test_i2s_loopback.py