diff --git a/.travis.yml b/.travis.yml
index 6aaaa910fb..d8d478ed13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,12 @@ install:
  - cd sleuthkit/sleuthkit 
  - sh install-sleuthkit.sh
 script:
- - set -e	
+ - set -e
+ - echo "building autopsy..." && echo -en 'travis_fold:start:script.build\\r'	
  - cd $TRAVIS_BUILD_DIR/
- - ant -q build > /dev/null
+ - ant -q build
+ - echo -en 'travis_fold:end:script.build\\r'
+ - echo "testing autopsy..." && echo -en 'travis_fold:start:script.tests\\r'
  - cd Core/
- - xvfb-run ant -q test	> /dev/null
-
+ - xvfb-run ant -q test
+ - echo -en 'travis_fold:end:script.tests\\r'
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..8911def936
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,51 @@
+version: 4.6.0.{build}
+
+cache:
+  - C:\Users\appveyor\.ant -> appveyor.yml
+  - C:\Users\appveyor\.ivy2 -> appveyor.yml
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+
+branches:
+    only:
+      - develop
+
+image: Visual Studio 2015
+platform: x64
+init:
+  - ps: choco install ant --ignore-dependencies
+  - ps: $env:Path="C:\Program Files\Java\jdk1.8.0\bin;$($env:Path);C:\ProgramData\chocolatey\lib\ant"
+  - set PATH=C:\Python36-x64\';%PATH%
+environment:
+    global:
+      TSK_HOME: "C:\\sleuthkit"
+      LIBVHDI_HOME: "C:\\libvhdi_64bit"
+      LIBVMDK_HOME: "C:\\libvmdk_64bit\\libvmdk"
+      LIBEWF_HOME: "C:\\libewf_64bit"
+      POSTGRESQL_HOME_64: "C:\\Program Files\\PostgreSQL\\9.5"
+      JDK_HOME: C:\Program Files\Java\jdk1.8.0
+      PYTHON: "C:\\Python36-x64"
+
+install:
+  - ps: pushd C:\
+  - git clone https://github.com/sleuthkit/sleuthkit
+  - ps: popd
+services:
+      - postgresql95
+
+
+build_script:
+  - cd %TSK_HOME%
+  - python setupLibs.py
+  - python win32\updateBuildLibs.py -m
+  - ps: pushd bindings/java
+  - ps: ant -version
+  - cmd: ant dist-PostgreSQL
+  - ps: popd
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - cmd: ant -q build
+  - cd Core
+  - cmd: ant -q test
+  - cd ..
+
+test: off