diff --git a/.travis.yml b/.travis.yml
index 2b03e199..4745d15a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,29 +22,29 @@ matrix:
         homebrew:
           packages:
             python@2
+          update: true
     - os: windows
       language: shell
       env:
         - GAMOS=windows
           PLATFORM=x64
-          CINST_ARGS=""
     - os: windows
       language: shell
       env:
         - GAMOS=windows
-        - CINST_ARGS=--forcex86
         - PLATFORM=x86
     - os: osx
       language: generic
       osx_image: xcode9.2
       env:
         - GAMOS=macos
-        - PLATFORM=x64-sierra-testing
+        - PLATFORM=x86_64-sierra-testing
         - TESTING=TRUE
       addons:
         homebrew:
           packages:
             python@2
+          update: true
     - os: linux
       language: python
       dist: precise
@@ -57,41 +57,10 @@ matrix:
       TESTING=TRUE
 
 before_install:
-- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-    powershell Install-WindowsFeature Net-Framework-Core;
-    cinst -y $CINST_ARGS python2;
-    export PATH=$PATH:/c/Python27/scripts;
-    cinst -y wixtoolset;
-  elif [[ "$PLATFORM" == "i686-precise-testing" ]]; then
-    dpkg --add-architecture i386;
-    apt install -y python:i386;
-    python -V;
-  fi
-- curl https://bootstrap.pypa.io/get-pip.py | sudo python
-- pip freeze > requirements.txt && pip install --user --upgrade -r requirements.txt && sudo rm requirements.txt
-- pip install --user pyinstaller
+- source src/travis/$TRAVIS_OS_NAME-$PLATFORM-before-install.sh
 
 install:
-- cd src
-- python -m PyInstaller --clean -F --distpath=gam $GAMOS-gam.spec
-- gam/gam version
-- export GAMVERSION=`gam/gam version simple`
-- cp LICENSE gam
-- cp whatsnew.txt gam
-- cp GamCommands.txt gam
-- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-    cp gam-setup.bat gam;
-    GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip;
-    /c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE gam -xr!.svn;
-    mkdir gam-64;
-    cp -rf gam/* gam-64/;
-    /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch $PLATFORM gam.wxs;
-    /c/Program\ Files\ \(x86\)/Wix\ Toolset\ v3.11/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/WixUIExtension.dll gam.wixobj -o gam-$GAMVERSION-$GAMOS-$PLATFORM.msi || true;
-    rm *.wixpdb;
-  else
-    GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.tar.xz;
-    tar cfJ $GAM_ARCHIVE gam/;
-  fi
+- source src/travis/$TRAVIS_OS_NAME-$PLATFORM-install.sh
 
 script:
 - gam/gam version
diff --git a/src/travis/linux-i686-precise-testing-before-install.sh b/src/travis/linux-i686-precise-testing-before-install.sh
new file mode 100644
index 00000000..5f21abb5
--- /dev/null
+++ b/src/travis/linux-i686-precise-testing-before-install.sh
@@ -0,0 +1,9 @@
+dpkg --add-architecture i386
+apt update
+apt install -y python:i386
+python -V
+pip install --upgrade pip
+pip freeze > requirements.txt
+pip install --upgrade -r requirements.txt
+rm requirements.txt
+pip install pyinstaller
diff --git a/src/travis/linux-i686-precise-testing-install.sh b/src/travis/linux-i686-precise-testing-install.sh
new file mode 120000
index 00000000..c9a3c6d1
--- /dev/null
+++ b/src/travis/linux-i686-precise-testing-install.sh
@@ -0,0 +1 @@
+linux-x86_64-install.sh
\ No newline at end of file
diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh
new file mode 100644
index 00000000..453625c9
--- /dev/null
+++ b/src/travis/linux-x86_64-before-install.sh
@@ -0,0 +1,5 @@
+pip install --upgrade pip
+pip freeze > requirements.txt
+pip install --upgrade -r requirements.txt
+rm requirements.txt
+pip install pyinstaller
diff --git a/src/travis/linux-x86_64-install.sh b/src/travis/linux-x86_64-install.sh
new file mode 100644
index 00000000..bab0a842
--- /dev/null
+++ b/src/travis/linux-x86_64-install.sh
@@ -0,0 +1,9 @@
+cd src
+pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
+gam/gam version
+export GAMVERSION=`gam/gam version simple`
+cp LICENSE gam
+cp whatsnew.txt gam
+cp GamCommands.txt gam
+GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.tar.xz
+tar cfJ $GAM_ARCHIVE gam/
diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh
new file mode 100644
index 00000000..453625c9
--- /dev/null
+++ b/src/travis/osx-x86_64-before-install.sh
@@ -0,0 +1,5 @@
+pip install --upgrade pip
+pip freeze > requirements.txt
+pip install --upgrade -r requirements.txt
+rm requirements.txt
+pip install pyinstaller
diff --git a/src/travis/osx-x86_64-install.sh b/src/travis/osx-x86_64-install.sh
new file mode 120000
index 00000000..c9a3c6d1
--- /dev/null
+++ b/src/travis/osx-x86_64-install.sh
@@ -0,0 +1 @@
+linux-x86_64-install.sh
\ No newline at end of file
diff --git a/src/travis/osx-x86_64-sierra-testing-before-install.sh b/src/travis/osx-x86_64-sierra-testing-before-install.sh
new file mode 100644
index 00000000..4b1bd9f0
--- /dev/null
+++ b/src/travis/osx-x86_64-sierra-testing-before-install.sh
@@ -0,0 +1,6 @@
+curl https://bootstrap.pypa.io/get-pip.py | sudo python
+pip freeze > requirements.txt
+sudo pip install --upgrade -r requirements.txt
+rm requirements.txt
+sudo pip install --upgrade altgraph
+sudo pip install pyinstaller
diff --git a/src/travis/osx-x86_64-sierra-testing-install.sh b/src/travis/osx-x86_64-sierra-testing-install.sh
new file mode 120000
index 00000000..c9a3c6d1
--- /dev/null
+++ b/src/travis/osx-x86_64-sierra-testing-install.sh
@@ -0,0 +1 @@
+linux-x86_64-install.sh
\ No newline at end of file
diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh
new file mode 100644
index 00000000..4858d7ef
--- /dev/null
+++ b/src/travis/windows-x86-before-install.sh
@@ -0,0 +1,9 @@
+powershell Install-WindowsFeature Net-Framework-Core
+cinst -y --forcex86 python2
+export PATH=$PATH:/c/Python27/scripts
+cinst -y wixtoolset
+pip install --upgrade pip
+pip freeze > requirements.txt
+pip install --upgrade -r requirements.txt
+rm requirements.txt
+pip install pyinstaller
diff --git a/src/travis/windows-x86-install.sh b/src/travis/windows-x86-install.sh
new file mode 100644
index 00000000..53278f67
--- /dev/null
+++ b/src/travis/windows-x86-install.sh
@@ -0,0 +1,14 @@
+cd src
+pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
+gam/gam version
+export GAMVERSION=`gam/gam version simple`
+cp LICENSE gam
+cp GamCommands.txt gam
+cp gam-setup.bat gam
+GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip
+/c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE gam -xr!.svn
+mkdir gam-64
+cp -rf gam/* gam-64/;
+/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch x86 gam.wxs
+/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/WixUIExtension.dll gam.wixobj -o gam-$GAMVERSION-$GAMOS-$PLATFORM.msi || true;
+rm *.wixpdb
diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh
new file mode 100644
index 00000000..991c21b5
--- /dev/null
+++ b/src/travis/windows-x86_64-before-install.sh
@@ -0,0 +1,9 @@
+powershell Install-WindowsFeature Net-Framework-Core
+cinst -y $CINST_ARGS python2
+export PATH=$PATH:/c/Python27/scripts
+cinst -y wixtoolset
+pip install --upgrade pip
+pip freeze > requirements.txt
+pip install --upgrade -r requirements.txt
+rm requirements.txt
+pip install pyinstaller
diff --git a/src/travis/windows-x86_64-install.sh b/src/travis/windows-x86_64-install.sh
new file mode 100644
index 00000000..58649269
--- /dev/null
+++ b/src/travis/windows-x86_64-install.sh
@@ -0,0 +1,14 @@
+cd src
+pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
+gam/gam version
+export GAMVERSION=`gam/gam version simple`
+cp LICENSE gam
+cp GamCommands.txt gam
+cp gam-setup.bat gam
+GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip
+/c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE gam -xr!.svn
+mkdir gam-64
+cp -rf gam/* gam-64/;
+/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch x64 gam.wxs
+/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/WixUIExtension.dll gam.wixobj -o gam-$GAMVERSION-$GAMOS-$PLATFORM.msi || true;
+rm *.wixpdb