diff --git a/.travis.yml b/.travis.yml
index 04df287..807315f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,22 @@
+# Use, modification, and distribution are
+# subject to the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Copyright Rene Rivera 2015-2016.
+
+branches:
+  only:
+    - master
+    - develop
+
+dist: trusty
+
 language: cpp
 
 notifications:
   email:
     recipients:
       - grafikrobot@gmail.com
-  irc:
-    channels:
-      - "chat.freenode.net#boost"
-    template:
-      - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
 
 sudo: required
 
@@ -62,10 +70,15 @@ matrix:
       os: osx
       osx_image: xcode7.2
 
-before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py"
-install: python script.py install
-before_script: python script.py before_script
-script: python script.py script
-after_success: python script.py after_success
-after_failure: python script.py after_failure
-after_script: python script.py after_script
+before_install:
+  # Fetch the scripts to do the actual building/testing.
+  - |
+    wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/ci_boost_common.py" -P ..
+    wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/ci_boost_library_test.py" -P ..
+
+install: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" install
+before_script: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" before_script
+script: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" script
+after_success: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" after_success
+after_failure: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" after_failure
+after_script: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" after_script