diff --git a/.travis.yml b/.travis.yml
index 1df823eebf74ade989355b67e7bb6a382517fc48..a2a46544e98fde4696c03bf0a9c087cae70397a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
 sudo : required
 dist : trusty
-
-language: cpp
+group : edge
 
 compiler:
     - gcc
     - clang
 os:
     - linux
+    - osx
 
 branches:
     only:
@@ -18,32 +18,16 @@ notifications:
             - dilawar.s.rajput@gmail.com
             - bhalla@ncbs.res.in
             - hrani@ncbs.res.in
-            - ray.subhasis@gmail.com
 
         on_success: change
         on_failure: always
 
 env:
     - CTEST_MODEL=Nightly
-cache: apt
+
 before_script:
-    - sudo apt-get update -qq
-    - sudo apt-get install libxml2-dev libbz2-dev wget
-    - sudo apt-get install libhdf5-serial-dev
-    - sudo apt-get install python-numpy python-setuptools python-networkx python-pip
-    - sudo apt-get install cmake cdbs
-    - sudo apt-get install python-suds python-matplotlib python-nose python-lxml
-    - sudo apt-get install python-qt4-dev python-qt4-gl python-sip-dev libqt4-dev libopenscenegraph-dev
-    - sudo apt-get install doxygen python-sphinx 
-    - sudo apt-get install git-buildpackage 
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./_travis/prepare_linux.sh ; fi
 
-install:
-    - wget http://ftp.debian.org/debian/pool/main/g/gsl/libgsl0ldbl_1.16+dfsg-2_amd64.deb -O gsl_1.16.deb
-    - sudo dpkg -i gsl_1.16.deb
-    - wget http://ftp.debian.org/debian/pool/main/g/gsl/libgsl0-dev_1.16+dfsg-2_amd64.deb -O gsl_1.16-dev.deb
-    - sudo dpkg -i gsl_1.16-dev.deb
-    - sudo apt-get install -f
-    - sudo ldconfig /usr/lib64
 
 script:
     - ./build_on_travis.sh
diff --git a/build_on_travis.sh b/_travis/build_on_linux.sh
similarity index 66%
rename from build_on_travis.sh
rename to _travis/build_on_linux.sh
index 3c4423069c9abb1926223313ca0958b848476873..b761e0cc4a2154202707e229716f6a4d610344cd 100755
--- a/build_on_travis.sh
+++ b/_travis/build_on_linux.sh
@@ -20,8 +20,10 @@
 set -o nounset                              # Treat unset variables as an error
 set -e
 
-gbp buildpackage  --git-ignore-branch --git-ignore-new -uc -us
-cd __moose-core_build && ctest --output-on-failure && cd ..
-sudo dpkg -D=2 -i ../moose*.deb
-cd ~ && /usr/bin/python -c \
-    "import moose; print moose.version(); print( moose.__file__ ); moose.test( timeout = 10 )"
+(
+    gbp buildpackage  --git-ignore-branch --git-ignore-new -uc -us
+    cd __moose-core_build && ctest --output-on-failure && cd ..
+    sudo dpkg -D=2 -i ../moose*.deb
+    cd ~ && /usr/bin/python -c \
+        "import moose; print moose.version(); print( moose.__file__ ); moose.test( timeout = 10 )"
+)
diff --git a/_travis/prepare_linux.sh b/_travis/prepare_linux.sh
new file mode 100644
index 0000000000000000000000000000000000000000..15d53fb9d68f7bce5369bd06248acfb21f7826d1
--- /dev/null
+++ b/_travis/prepare_linux.sh
@@ -0,0 +1,14 @@
+#!/bin/bash/env bash
+
+sudo apt-get update -qq
+sudo apt-get install libxml2-dev libbz2-dev wget
+sudo apt-get install libhdf5-serial-dev
+sudo apt-get install python-numpy python-setuptools python-networkx python-pip
+sudo apt-get install cmake cdbs
+sudo apt-get install python-suds python-matplotlib python-nose python-lxml
+sudo apt-get install python-qt4-dev python-qt4-gl python-sip-dev libqt4-dev libopenscenegraph-dev
+sudo apt-get install doxygen python-sphinx 
+sudo apt-get install git-buildpackage 
+sudo apt-get install libgsl-dev
+sudo apt-get install -f
+sudo ldconfig /usr/lib64