diff --git a/.travis.yml b/.travis.yml
index 08ced47c8..9cb01c741 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
 sudo: false
 language: java
 
+dist:
+  - trusty
+
 before_script:
-  - if [[ "x$JDK" == *'x9'* ]]; then remove_dir_from_path $JAVA_HOME/bin; export JAVA_HOME=/usr/lib/jvm/java-9-oracle; export PATH=$JAVA_HOME/bin:$PATH; java -Xmx32m -version; fi
+  - if [[ "x$JDK" == *'x9'* ]]; then export MAVEN_SKIP_RC=true; fi
   - if [[ "x$JDK" != *'x9'* ]]; then export COVERALLS=coveralls:report; fi
 
 script:
@@ -22,11 +25,7 @@ matrix:
   fast_finish: true
   include:
     - jdk: oraclejdk8
-    - jdk: oraclejdk8 # this will be overridden by before_script above
-      addons:
-        apt:
-          packages:
-            - oracle-java9-installer
+    - jdk: oraclejdk9
       env:
         - JDK=9
 
diff --git a/pom.xml b/pom.xml
index c7a744f78..b43387854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
       <felix.bundle.plugin.version>3.3.0</felix.bundle.plugin.version>
       <felix.version>5.6.2</felix.version>
       <hibernate.version>5.2.9.Final</hibernate.version>
-      <javassist.version>3.21.0-GA</javassist.version>
+      <javassist.version>3.22.0-CR1</javassist.version>
       <jndi.version>0.11.4.1</jndi.version>
       <maven.release.version>2.5.3</maven.release.version>
       <metrics.version>3.2.2</metrics.version>
@@ -369,7 +369,7 @@
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
-               <version>2.19.1</version>
+               <version>2.20</version>
                <configuration>
                   <!-- Sets the VM argument line used when unit tests are run. -->
                   <argLine>${surefireArgLine} ${sureFireOptions9}</argLine>