diff --git a/.travis.yml b/.travis.yml
index d7341c015..518a848d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,7 +100,7 @@ env:
   - BUILD_TYPE='compile-nrf52-ports' BUILD_CATEGORY='compile' BUILD_ARCH='nrf52dk'
   - BUILD_TYPE='compile-tools' BUILD_CATEGORY='compile'
   - BUILD_TYPE='rpl-lite' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='rpl' BUILD_CATEGORY='sim'
+  - BUILD_TYPE='rpl-classic' BUILD_CATEGORY='sim'
   - BUILD_TYPE='ipv6' BUILD_CATEGORY='sim'
   - BUILD_TYPE='base' BUILD_CATEGORY='sim'
   - BUILD_TYPE='ieee802154' BUILD_CATEGORY='sim'
diff --git a/tests/15-rpl/01-rpl-up-route.csc b/tests/15-rpl-classic/01-rpl-up-route.csc
similarity index 100%
rename from tests/15-rpl/01-rpl-up-route.csc
rename to tests/15-rpl-classic/01-rpl-up-route.csc
diff --git a/tests/15-rpl/02-rpl-root-reboot.csc b/tests/15-rpl-classic/02-rpl-root-reboot.csc
similarity index 100%
rename from tests/15-rpl/02-rpl-root-reboot.csc
rename to tests/15-rpl-classic/02-rpl-root-reboot.csc
diff --git a/tests/15-rpl/03-rpl-28-hours.csc b/tests/15-rpl-classic/03-rpl-28-hours.csc
similarity index 100%
rename from tests/15-rpl/03-rpl-28-hours.csc
rename to tests/15-rpl-classic/03-rpl-28-hours.csc
diff --git a/tests/15-rpl/05-rpl-up-and-down-routes.csc b/tests/15-rpl-classic/05-rpl-up-and-down-routes.csc
similarity index 100%
rename from tests/15-rpl/05-rpl-up-and-down-routes.csc
rename to tests/15-rpl-classic/05-rpl-up-and-down-routes.csc
diff --git a/tests/15-rpl/06-rpl-temporary-root-loss.csc b/tests/15-rpl-classic/06-rpl-temporary-root-loss.csc
similarity index 100%
rename from tests/15-rpl/06-rpl-temporary-root-loss.csc
rename to tests/15-rpl-classic/06-rpl-temporary-root-loss.csc
diff --git a/tests/15-rpl/07-rpl-random-rearrangement.csc b/tests/15-rpl-classic/07-rpl-random-rearrangement.csc
similarity index 100%
rename from tests/15-rpl/07-rpl-random-rearrangement.csc
rename to tests/15-rpl-classic/07-rpl-random-rearrangement.csc
diff --git a/tests/15-rpl/08-rpl-dao-route-loss-0.csc b/tests/15-rpl-classic/08-rpl-dao-route-loss-0.csc
similarity index 100%
rename from tests/15-rpl/08-rpl-dao-route-loss-0.csc
rename to tests/15-rpl-classic/08-rpl-dao-route-loss-0.csc
diff --git a/tests/15-rpl/08-rpl-dao-route-loss-1.csc b/tests/15-rpl-classic/08-rpl-dao-route-loss-1.csc
similarity index 100%
rename from tests/15-rpl/08-rpl-dao-route-loss-1.csc
rename to tests/15-rpl-classic/08-rpl-dao-route-loss-1.csc
diff --git a/tests/15-rpl/08-rpl-dao-route-loss-2.csc b/tests/15-rpl-classic/08-rpl-dao-route-loss-2.csc
similarity index 100%
rename from tests/15-rpl/08-rpl-dao-route-loss-2.csc
rename to tests/15-rpl-classic/08-rpl-dao-route-loss-2.csc
diff --git a/tests/15-rpl/08-rpl-dao-route-loss-3.csc b/tests/15-rpl-classic/08-rpl-dao-route-loss-3.csc
similarity index 100%
rename from tests/15-rpl/08-rpl-dao-route-loss-3.csc
rename to tests/15-rpl-classic/08-rpl-dao-route-loss-3.csc
diff --git a/tests/15-rpl/08-rpl-dao-route-loss-4.csc b/tests/15-rpl-classic/08-rpl-dao-route-loss-4.csc
similarity index 100%
rename from tests/15-rpl/08-rpl-dao-route-loss-4.csc
rename to tests/15-rpl-classic/08-rpl-dao-route-loss-4.csc
diff --git a/tests/15-rpl/08-rpl-dao-route-loss-5.csc b/tests/15-rpl-classic/08-rpl-dao-route-loss-5.csc
similarity index 100%
rename from tests/15-rpl/08-rpl-dao-route-loss-5.csc
rename to tests/15-rpl-classic/08-rpl-dao-route-loss-5.csc
diff --git a/tests/15-rpl/09-rpl-probing.csc b/tests/15-rpl-classic/09-rpl-probing.csc
similarity index 100%
rename from tests/15-rpl/09-rpl-probing.csc
rename to tests/15-rpl-classic/09-rpl-probing.csc
diff --git a/tests/15-rpl/10-rpl-multi-dodag.csc b/tests/15-rpl-classic/10-rpl-multi-dodag.csc
similarity index 100%
rename from tests/15-rpl/10-rpl-multi-dodag.csc
rename to tests/15-rpl-classic/10-rpl-multi-dodag.csc
diff --git a/tests/15-rpl/Makefile b/tests/15-rpl-classic/Makefile
similarity index 100%
rename from tests/15-rpl/Makefile
rename to tests/15-rpl-classic/Makefile
diff --git a/tests/15-rpl/code/Makefile b/tests/15-rpl-classic/code/Makefile
similarity index 100%
rename from tests/15-rpl/code/Makefile
rename to tests/15-rpl-classic/code/Makefile
diff --git a/tests/15-rpl/code/project-conf.h b/tests/15-rpl-classic/code/project-conf.h
similarity index 100%
rename from tests/15-rpl/code/project-conf.h
rename to tests/15-rpl-classic/code/project-conf.h
diff --git a/tests/15-rpl/code/receiver-node.c b/tests/15-rpl-classic/code/receiver-node.c
similarity index 100%
rename from tests/15-rpl/code/receiver-node.c
rename to tests/15-rpl-classic/code/receiver-node.c
diff --git a/tests/15-rpl/code/root-node.c b/tests/15-rpl-classic/code/root-node.c
similarity index 100%
rename from tests/15-rpl/code/root-node.c
rename to tests/15-rpl-classic/code/root-node.c
diff --git a/tests/15-rpl/code/sender-node.c b/tests/15-rpl-classic/code/sender-node.c
similarity index 100%
rename from tests/15-rpl/code/sender-node.c
rename to tests/15-rpl-classic/code/sender-node.c