diff --git a/.travis.yml b/.travis.yml
index c457de7f0..87251470f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ php:
   - 5.6
   - hhvm
 
-before_script: bash test/before_script.sh
+before_script: 
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
 
 script:
   - phpunit
-
-after_script: bash test/after_script.sh
diff --git a/test/.noninteractive b/test/.noninteractive
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/after_script.sh b/test/after_script.sh
deleted file mode 100644
index f8d242c1b..000000000
--- a/test/after_script.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then
-  echo "HHVM";
-fi;
diff --git a/test/before_script.sh b/test/before_script.sh
deleted file mode 100644
index c741ff949..000000000
--- a/test/before_script.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then
-  echo "HHVM"
-else 
-  sudo apt-get update -qq 
-  sudo apt-get install -y -qq libssh2-1-dev libssh2-php
-  pecl install -f ssh2-beta < test/.noninteractive
-  php -m | grep ssh2
-fi;
-
-composer self-update
-composer install --no-interaction --prefer-source --dev
-
-echo `whoami`":1234" | sudo chpasswd