4 files changed, 9 insertions, 6 deletions

diff --git a/.busted b/.busted
index e77322d6..a8d40bef 100644
--- a/.busted
+++ b/.busted
@@ -1,6 +1,6 @@
 return {
    default = {
-      output = "gtest",
+      output = "htest",
       verbose = true,
       ["exclude-pattern"] = "sum_spec", -- do not run spec files inside fixture
       helper = "spec.util.test_env",
diff --git a/.travis.yml b/.travis.yml
index aa81ff7f..f5b6bb37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,8 @@ smoke_script: &smoke_script
   - ./smoke_test.sh luarocks-$BRANCH.tar.gz
   
 unit_script: &unit_script
-  - busted -o gtest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
-  - busted -o gtest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
+  - busted -o htest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
+  - busted -o htest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
   
 integration_script: &integration_script
   - lua -v
@@ -28,8 +28,8 @@ integration_script: &integration_script
   - ./configure --with-lua=lua_install
   - ./makedist dev
   - ./smoke_test.sh luarocks-dev.tar.gz
-  - busted -o gtest --exclude-tags=gpg,git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
-  - busted -o gtest --exclude-tags=gpg,git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
+  - busted -o htest --exclude-tags=gpg,git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
+  - busted -o htest --exclude-tags=gpg,git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
           
 jobs:
   include:
@@ -148,6 +148,7 @@ before_install:
 install:
   - if [ ! -f lua_install/bin/busted ]; then luarocks install busted; fi
   - if [ ! -f lua_install/bin/luacov ]; then luarocks install cluacov; fi
+  - luarocks install busted-htest
 
 after_success:
   - luacov -c $TRAVIS_BUILD_DIR/testrun/luacov.config
diff --git a/appveyor.yml b/appveyor.yml
index 6a4f9417..7011c80c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -90,9 +90,10 @@ before_build:
 build_script:
   - IF NOT EXIST lua_install-%LUAV%\bin\busted.bat ( luarocks install busted 1> NUL 2> NUL )
   - IF NOT EXIST lua_install-%LUAV%\bin\luacov.bat ( luarocks install cluacov 1> NUL 2> NUL )
+  - luarocks install busted-htest 1> NUL 2> NUL
 
 test_script:
-  - busted -o gtest -v --lpath=.//?.lua --exclude-tags=ssh,unix,%EXCLUDE% -Xhelper lua_dir=%CD%\lua_install-%LUAV%,appveyor,%COMPILER% %FILES%
+  - busted -o htest -v --lpath=.//?.lua --exclude-tags=ssh,unix,%EXCLUDE% -Xhelper lua_dir=%CD%\lua_install-%LUAV%,appveyor,%COMPILER% %FILES%
 
 after_test:
   - pip install codecov
diff --git a/luarocks-dev-1.rockspec b/luarocks-dev-1.rockspec
index a1f30ef4..c7933042 100644
--- a/luarocks-dev-1.rockspec
+++ b/luarocks-dev-1.rockspec
@@ -22,6 +22,7 @@ description = {
 }
 test_dependencies = {
    "luacov",
+   "busted-htest",
 }
 test = {
    type = "busted",