diff --git a/.travis.yml b/.travis.yml
index 71f4fc0b3dd..64f88ce7805 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,17 +30,14 @@ addons:
   postgresql: "9.1"
 
 before_install:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then ./ci/travis/before_install-linux.sh; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then ./ci/travis/before_install-osx.sh; fi"
+  - ./ci/travis/${TRAVIS_OS_NAME}/before_install.sh
 
 install:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then ./ci/travis/install-linux.sh; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then ./ci/travis/install-osx.sh; fi"
+  - ./ci/travis/${TRAVIS_OS_NAME}/install.sh
 
 before_script:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then ./ci/travis/before_script-linux.sh; fi"
+  - ./ci/travis/${TRAVIS_OS_NAME}/before_script.sh
 
 script:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then ./ci/travis/script-linux.sh; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then ./ci/travis/script-osx.sh; fi"
+  - ./ci/travis/${TRAVIS_OS_NAME}/script.sh
 
diff --git a/ci/travis/before_install-linux.sh b/ci/travis/linux/before_install.sh
similarity index 100%
rename from ci/travis/before_install-linux.sh
rename to ci/travis/linux/before_install.sh
diff --git a/ci/travis/before_script-linux.sh b/ci/travis/linux/before_script.sh
similarity index 100%
rename from ci/travis/before_script-linux.sh
rename to ci/travis/linux/before_script.sh
diff --git a/ci/travis/install-linux.sh b/ci/travis/linux/install.sh
similarity index 100%
rename from ci/travis/install-linux.sh
rename to ci/travis/linux/install.sh
diff --git a/ci/travis/script-linux.sh b/ci/travis/linux/script.sh
similarity index 100%
rename from ci/travis/script-linux.sh
rename to ci/travis/linux/script.sh
diff --git a/ci/travis/before_install-osx.sh b/ci/travis/osx/before_install.sh
similarity index 100%
rename from ci/travis/before_install-osx.sh
rename to ci/travis/osx/before_install.sh
diff --git a/ci/travis/osx/before_script.sh b/ci/travis/osx/before_script.sh
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/ci/travis/install-osx.sh b/ci/travis/osx/install.sh
similarity index 100%
rename from ci/travis/install-osx.sh
rename to ci/travis/osx/install.sh
diff --git a/ci/travis/script-osx.sh b/ci/travis/osx/script.sh
similarity index 100%
rename from ci/travis/script-osx.sh
rename to ci/travis/osx/script.sh