diff --git a/.travis.yml b/.travis.yml
index 57147b004f0..ec6ed80dac7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ before_script:
   - export MAVEN_SKIP_RC=true
 
 install: 
-  - travis_wait 60 mvn install --no-snapshot-updates -Pdistribution -DskipTests=true -B -V -q
+  - travis_wait 60 mvn install --no-snapshot-updates -Pdistribution -DskipTestsuite -B -V -q
 
 script:
   - ./travis-run-tests.sh $TESTS
diff --git a/pom.xml b/pom.xml
index eabcaa981ed..4f128e29b5c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -192,7 +192,6 @@
         <module>adapters</module>
         <module>authz</module>
         <module>examples</module>
-        <module>testsuite</module>
         <module>misc</module>
     </modules>
 
@@ -1540,6 +1539,18 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>testsuite</id>
+            <activation>
+                <property>
+                    <name>!skipTestsuite</name>
+                </property>
+            </activation>
+            <modules>
+                <module>testsuite</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>distribution</id>
             <modules>
diff --git a/travis-run-tests.sh b/travis-run-tests.sh
index cf5f03b90cc..67c8655fd98 100755
--- a/travis-run-tests.sh
+++ b/travis-run-tests.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+travis_wait 60 mvn install --no-snapshot-updates -DskipTests=true -B -V -q -f testsuite
+
 if [ $1 == "old" ]; then
     mvn test -B --no-snapshot-updates -f testsuite/integration
     mvn test -B --no-snapshot-updates -f testsuite/jetty