diff --git a/.travis.yml b/.travis.yml
index 1ab4c9796..ac3179ac7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,9 @@ env:
   - DB=postgres BUILD_TYPE=cucumber
   - DB=mysql BUILD_TYPE=cucumber
 
-before_install: gem install bundler --pre
+before_install: "./script/ci/before_install.sh"
 bundler_args: "--without development production heroku"
-before_script: "./config/ci/before-travis.sh"
+before_script: "./script/ci/before.sh"
 script: "bundle exec rake travis"
 
 
diff --git a/config/ci/before-travis.sh b/script/ci/before.sh
similarity index 78%
rename from config/ci/before-travis.sh
rename to script/ci/before.sh
index e8314c461..977f218a1 100755
--- a/config/ci/before-travis.sh
+++ b/script/ci/before.sh
@@ -1,13 +1,10 @@
-# Ensure known RubyGems version
-if [ "$(gem --version)" != "1.8.12" ]; then
-  echo "RubyGems version is $(gem --version). Changing..."
-  rvm rubygems 1.8.12
-fi
+#!/bin/bash
 
 # Install firefox & Xvfb, in preparation for cucumber & jasmine
+
 #echo "Installing Firefox and Xvfb"
 #sudo aptitude --quiet=2 --without-recommends --assume-yes install firefox xvfb
-#sudo cp config/ci/xvfb /etc/init.d/xvfb
+#sudo cp script/ci/xvfb /etc/init.d/xvfb
 echo "Start Xvfb"
 sh -e /etc/init.d/xvfb start
 
diff --git a/script/ci/before_install.sh b/script/ci/before_install.sh
new file mode 100755
index 000000000..f2992db23
--- /dev/null
+++ b/script/ci/before_install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Ensure known RubyGems version
+if [ "$(gem --version)" != "1.8.12" ]; then
+  echo "RubyGems version is $(gem --version). Changing..."
+  rvm rubygems 1.8.12
+  echo "Changed RubyGems version to $(gem --version)."
+fi
+
+# Get latest bundler
+gem install bundler --pre
diff --git a/config/ci/xvfb b/script/ci/xvfb
old mode 100644
new mode 100755
similarity index 100%
rename from config/ci/xvfb
rename to script/ci/xvfb