diff --git a/.travis.yml b/.travis.yml
index f693c0f6b..9de7c5977 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,14 +13,19 @@ osx_image: xcode8.1
 matrix:
   fast_finish: true
 
-addons:
-  artifacts:
-    paths:
-      - $(ls powershell*{deb,pkg,AppImage} | tr "\n" ":")
-      - pester-tests.xml
-
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      brew update;
+      brew install openssl;
+      mkdir -p /usr/local/lib;
+      ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/;
+      ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/;
+    fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      nvm install v6.0.0;
+    fi
 install:
-  - pushd tools
+  - pushd Travis
   - ./download.sh
   - popd
   # Default 2.0.0 Ruby is buggy
@@ -34,8 +39,7 @@ install:
 
 script:
   - ulimit -n 4096
-  - powershell -File tools/travis.ps1
-  # spellcheck
+  - powershell -File Travis/travis.ps1
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       mdspell '**/*.md' '!powershell/**/*.md' --ignore-numbers --ignore-acronyms --report;
     fi
\ No newline at end of file
diff --git a/Travis/download.sh b/Travis/download.sh
index 2894e7ff1..3cfe546ea 100644
--- a/Travis/download.sh
+++ b/Travis/download.sh
@@ -13,7 +13,7 @@ get_url() {
     echo "https://github.com/$fork/PowerShell/releases/download/$release/$1"
 }
 
-fork="PowerShell"
+fork="scrthq"
 # Get OS specific asset ID and package name
 case "$OSTYPE" in
     linux*)