diff --git a/.appveyor.yml b/.appveyor.yml
index 478febe3..ee304c29 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,12 +16,6 @@ platform:
 
 environment:
   matrix:
-    - compiler: MinGW
-      configuration: Release
-      build_with: autoconf
-    - compiler: Cygwin
-      configuration: Release
-      build_with: autoconf
     - compiler: MSVC
       configuration: Release
       build_with: cmake
@@ -31,6 +25,12 @@ environment:
     - compiler: MSVC
       configuration: Release Lib
       build_with: msbuild
+    - compiler: MinGW
+      configuration: Release
+      build_with: autoconf
+    - compiler: Cygwin
+      configuration: Release
+      build_with: autoconf
 
 matrix:
   exclude:
@@ -60,29 +60,26 @@ for:
       - compiler: MSVC
 
   install:
+    - git submodule update --init
     - ps: >-
         If ($env:Platform -Match "Win32") {
-          $env:HDF5_DIR="C:\projects\HDF5-1.8.13-win32"
+          $env:HDF5_DIR="C:\projects\matio\.ci\ci\HDF5-1.8.13-win32"
           $env:sdk_platform_env="x86"
           If ($env:configuration -Match "Lib") {
-            Start-FileDownload 'https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.13/bin/windows/hdf5-1.8.13-win32-VS2010-static.zip'
             7z x -y hdf5-1.8.13-win32-VS2010-static.zip | FIND "ing archive"
           } Else {
-            Start-FileDownload 'https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.13/bin/windows/hdf5-1.8.13-win32-VS2010-shared.zip'
             7z x -y hdf5-1.8.13-win32-VS2010-shared.zip | FIND "ing archive"
           }
-          7z x -oC:\projects\HDF5-1.8.13-win32 -y hdf5-1.8.13\HDF5-1.8.13-win32.exe | FIND "ing archive"
+          7z x -oC:\projects\matio\.ci\ci\HDF5-1.8.13-win32 -y hdf5-1.8.13\HDF5-1.8.13-win32.exe | FIND "ing archive"
         } Else {
-          $env:HDF5_DIR="C:\projects\HDF5-1.8.13-win64"
+          $env:HDF5_DIR="C:\projects\matio\.ci\ci\HDF5-1.8.13-win64"
           $env:sdk_platform_env="x64"
           If ($env:configuration -Match "Lib") {
-            Start-FileDownload 'https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.13/bin/windows/hdf5-1.8.13-win64-VS2010-static.zip'
             7z x -y hdf5-1.8.13-win64-VS2010-static.zip | FIND "ing archive"
           } Else {
-            Start-FileDownload 'https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.13/bin/windows/hdf5-1.8.13-win64-VS2010-shared.zip'
             7z x -y hdf5-1.8.13-win64-VS2010-shared.zip | FIND "ing archive"
           }
-          7z x -oC:\projects\HDF5-1.8.13-win64 -y hdf5-1.8.13\HDF5-1.8.13-win64.exe | FIND "ing archive"
+          7z x -oC:\projects\matio\.ci\ci\HDF5-1.8.13-win64 -y hdf5-1.8.13\HDF5-1.8.13-win64.exe | FIND "ing archive"
         }
     - ps: $env:CONFIGURATION_OLD=$env:configuration
     - call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /Release /%sdk_platform_env%
diff --git a/.ci/ci b/.ci/ci
new file mode 160000
index 00000000..814b558c
--- /dev/null
+++ b/.ci/ci
@@ -0,0 +1 @@
+Subproject commit 814b558c7c14b6092f9ee5e1205a86cebb711c64
diff --git a/.gitmodules b/.gitmodules
index 0b025ef6..e1b2fd51 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "test/datasets"]
 	path = test/datasets
 	url = git://git.code.sf.net/p/matio/matio_test_datasets
+[submodule ".ci/ci"]
+	path = .ci/ci
+	url = https://github.com/tbeu/matio-ci.git