diff --git a/.travis-test-only.sh b/.travis-test-only.sh
new file mode 100755
index 0000000000..9b8b8f9e62
--- /dev/null
+++ b/.travis-test-only.sh
@@ -0,0 +1,2 @@
+sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; $1/testOnly $2 -- xonly timefactor 3 neverstore exclude travis"
+
diff --git a/.travis-test.sh b/.travis-test.sh
index cde8a426aa..4da64d22dd 100755
--- a/.travis-test.sh
+++ b/.travis-test.sh
@@ -1,2 +1,2 @@
-sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; $1/testOnly -- timefactor 3 neverstore exclude travis"
+sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; $1/testOnly -- xonly timefactor 3 neverstore exclude travis"
 
diff --git a/.travis.yml b/.travis.yml
index ccc8b7259c..a38a873407 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,16 +21,16 @@ before_cache:
   - find $HOME/.sbt        -name "*.lock"               -print -delete
 
 script:
-  - sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; coreJVM/testOnly *.c.* -- timefactor 3 neverstore exclude travis"
-  - sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; coreJVM/testOnly *.e.* -- timefactor 3 neverstore exclude travis"
-  - sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; coreJVM/testOnly *.i.* -- timefactor 3 neverstore exclude travis"
-  - sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; coreJVM/testOnly *.m.* -- timefactor 3 neverstore exclude travis"
-  - sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; coreJVM/testOnly *.s.* -- timefactor 3 neverstore exclude travis"
-  - sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; coreJVM/testOnly *.r.* -- timefactor 3 neverstore exclude travis"
-  - sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; coreJVM/testOnly *.t.* -- timefactor 3 neverstore exclude travis"
-  - sbt -jvm-opts .travis.jvmopts -sbt-version 0.13.16 -scala-version $TRAVIS_SCALA_VERSION ";set parallelExecution in ThisBuild := false; coreJVM/testOnly *.x.* -- timefactor 3 neverstore exclude travis"
-
-  #- ./.travis-test.sh coreJVM
+
+  - ./.travis-test-only.sh coreJVM *.c*
+  - ./.travis-test-only.sh coreJVM *.e*
+  - ./.travis-test-only.sh coreJVM *.i*
+  - ./.travis-test-only.sh coreJVM *.m*
+  - ./.travis-test-only.sh coreJVM *.r*
+  - ./.travis-test-only.sh coreJVM *.s*
+  - ./.travis-test-only.sh coreJVM *.t*
+  - ./.travis-test-only.sh coreJVM *.x*
+
   - ./.travis-test.sh tests
 
   - ./.travis-test.sh examplesJVM
diff --git a/version.sbt b/version.sbt
index 54aaca1f23..ac82d4ddad 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "4.0.0-RC4"
+version in ThisBuild := "4.0.0"