diff --git a/.travis.yml b/.travis.yml
index ff941b912aec6518cc65ecf75ca01f9480d2e622..10bd1b98bfb62cfab38f054d32eefd5dc5aea244 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,8 @@ matrix:
     os: osx
 
 install:
-  - ./install-sleuthkit.sh
+  - ./travis_build.sh
 
 script:
   - make check
   - if test ${TRAVIS_OS_NAME} = "linux"; then cd release; ./release-unix.pl ci; fi
-
-# NOTE: OS X doesn't have ant, so CI fails
diff --git a/appveyor.yml b/appveyor.yml
index 7c8ba04a84f47fe99cea0399e620de97bae94a3c..177529d7294dacc443d95582974850d3843cc454 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,8 +32,8 @@ services:
       - postgresql95;
 
 build_script:
-      - python setupLibs.py
-      - python win32\updateBuildLibs.py -m
+      - python setupDevRepos.py
+      - python win32\updateAndBuildAll.py -m 
       - ps: ant -version
       - ps: pushd bindings/java
       - cmd: ant dist-PostgreSQL
diff --git a/setupLibs.py b/setupDevRepos.py
similarity index 100%
rename from setupLibs.py
rename to setupDevRepos.py
diff --git a/install-sleuthkit.sh b/travis_build.sh
similarity index 100%
rename from install-sleuthkit.sh
rename to travis_build.sh
diff --git a/win32/updateBuildLibs.py b/win32/updateAndBuildAll.py
similarity index 100%
rename from win32/updateBuildLibs.py
rename to win32/updateAndBuildAll.py