2 files changed, 22 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index 02bdb6c9..4962f290 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,8 +55,8 @@ script:
   - busted -Xhelper travis,env=full --verbose
 
 after_success:
-  - luacov-coveralls -c $TRAVIS_BUILD_DIR/test/luacov.config --exclude $TRAVIS_BUILD_DIR/test/
   - luacov -c $TRAVIS_BUILD_DIR/test/luacov.config
+  - cd $TRAVIS_BUILD_DIR/test/ && bash <(curl -s https://codecov.io/bash)
   - grep "Summary" -B1 -A1000 $TRAVIS_BUILD_DIR/test/luacov.report.out
 
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
index d7fc7cc2..66a12896 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,28 +3,36 @@ version: 2.2.1.{build}-test
 shallow_clone: true
 
 environment:
-  LUAROCKS_VER: 2.2.1
+  LUAROCKS_VER: 2.3.0
 
   matrix:
-  - LUA_VER: 5.1.5
-  - LUA_VER: 5.2.4
-  - LUA_VER: 5.3.1
-  - LJ_VER: 2.0.4
-  - LJ_VER: 2.1
+  - LUA: "lua 5.1"
+  - LUA: "lua 5.2"
+  - LUA: "lua 5.3"
+  - LUA: "luajit 2.0"
+  - LUA: "luajit 2.1"
+
 
 init:
 # Setup Lua development/build environment
 # Make VS 2015 command line tools available
 - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform%
 
-install:
-# Setup Lua development/build environment
-- call .appveyor\install.bat
+before_build:
+  - set PATH=C:\Python27\Scripts;%PATH% # Add directory containing 'pip' to PATH
+  - pip install hererocks
+  - hererocks env --%LUA% -rlatest
+  - call env\bin\activate
 
 build_script:
-- call .appveyor\build.bat
+  - luarocks install busted 1> NUL 2> NUL
 
 test_script:
-- echo "Testing..."
-- cd test
-- call testing.bat
+  - busted --lpath=.//?.lua --exclude-tags=ssh,unix,mock -Xhelper appveyor
+
+after_test:
+  - if "%LUA%"=="lua 5.1" (luarocks show bit32 || luarocks install bit32)
+  - luarocks install luacov
+  - pip install codecov
+  - luacov -c test/luacov.config
+  - cd test && codecov
\ No newline at end of file