diff --git a/packaging/tests/tas-restapi/.travis.yml b/packaging/tests/tas-restapi/.travis.yml
index cd4f735fde..b4902013b6 100644
--- a/packaging/tests/tas-restapi/.travis.yml
+++ b/packaging/tests/tas-restapi/.travis.yml
@@ -22,7 +22,7 @@ jobs:
   include:
     - stage: test
       name: "Build and test"
-      script: travis_retry mvn test
+      script: travis_retry mvn test -Dtest=ModelAssertionTest
     - stage: release
       name: "Push to Nexus"
       if: fork = false AND branch = master AND type != pull_request AND commit_message !~ /\[no-release\]/
diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/RestDemoTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/RestDemoTests.java
similarity index 100%
rename from packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/RestDemoTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/RestDemoTests.java
diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/SampleCommentsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/SampleCommentsTests.java
similarity index 100%
rename from packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/SampleCommentsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/SampleCommentsTests.java
diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/SamplePeopleTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/SamplePeopleTests.java
similarity index 100%
rename from packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/SamplePeopleTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/SamplePeopleTests.java
diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/SampleSitesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/SampleSitesTests.java
similarity index 100%
rename from packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/SampleSitesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/SampleSitesTests.java
diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/workshop/RestApiDemoTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/workshop/RestApiDemoTests.java
similarity index 100%
rename from packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/workshop/RestApiDemoTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/workshop/RestApiDemoTests.java
diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/workshop/RestApiWorkshopTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/workshop/RestApiWorkshopTests.java
similarity index 100%
rename from packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/demo/workshop/RestApiWorkshopTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/workshop/RestApiWorkshopTests.java