55 files changed, 129 insertions, 121 deletions

diff --git a/.busted b/.busted
index 29a8137b..8b246f0c 100644
--- a/.busted
+++ b/.busted
@@ -1,6 +1,6 @@
 return {
    default = {
-      helper = "test/test_environment",
+      helper = "spec.util.test_env",
       ["auto-insulate"] = false
    }
 }
diff --git a/spec/add_spec.lua b/spec/add_spec.lua
index d42a97d0..1bc9e2a3 100644
--- a/spec/add_spec.lua
+++ b/spec/add_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
@@ -34,7 +34,7 @@ describe("LuaRocks add tests #blackbox #b_add", function()
       
       --TODO This test fails, sftp support not yet implemented
       it("LuaRocks-admin add invalid server", function()
-         assert.is_false(run.luarocks_admin_bool("--server=testing add luasocket-3.0rc1-2.src.rock", { LUAROCKS_CONFIG = testing_paths.testing_dir .. "/testing_config_sftp.lua" } ))
+         assert.is_false(run.luarocks_admin_bool("--server=testing add luasocket-3.0rc1-2.src.rock", { LUAROCKS_CONFIG = testing_paths.testrun_dir .. "/testing_config_sftp.lua" } ))
       end)
       
       it("LuaRocks-admin add, split server url", function()
diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index 459a7292..2de05879 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
@@ -140,7 +140,7 @@ describe("LuaRocks build tests #blackbox #b_build", function()
    describe("LuaRocks build - more complex tests", function()
       if test_env.TYPE_TEST_ENV == "full" then
          it("LuaRocks build luacheck show downloads test_config", function()
-            local output = run.luarocks("build luacheck", { LUAROCKS_CONFIG = testing_paths.testing_dir .. "/testing_config_show_downloads.lua"} )
+            local output = run.luarocks("build luacheck", { LUAROCKS_CONFIG = testing_paths.testrun_dir .. "/testing_config_show_downloads.lua"} )
             assert.is.truthy(output:match("%.%.%."))
          end)
       end
@@ -190,7 +190,7 @@ describe("LuaRocks build tests #blackbox #b_build", function()
       end)
 
       it("LuaRocks build invalid patch", function()
-         assert.is_false(run.luarocks_bool("build " .. testing_paths.testing_dir .. "/testfiles/invalid_patch-0.1-1.rockspec"))
+         assert.is_false(run.luarocks_bool("build " .. testing_paths.fixtures_dir .. "/invalid_patch-0.1-1.rockspec"))
       end)
    end)
 
@@ -204,12 +204,12 @@ describe("LuaRocks build tests #blackbox #b_build", function()
       end)
 
       it("fails when missing external dependency", function()
-         assert.is_false(run.luarocks_bool("build " .. testing_paths.testing_dir .. "/testfiles/missing_external-0.1-1.rockspec INEXISTENT_INCDIR=\"/invalid/dir\""))
+         assert.is_false(run.luarocks_bool("build " .. testing_paths.fixtures_dir .. "/missing_external-0.1-1.rockspec INEXISTENT_INCDIR=\"/invalid/dir\""))
       end)
 
       it("builds with external dependency", function()
-         local rockspec = testing_paths.testing_dir .. "/testfiles/with_external_dep-0.1-1.rockspec"
-         local foo_incdir = testing_paths.testing_dir .. "/testfiles/with_external_dep"
+         local rockspec = testing_paths.fixtures_dir .. "/with_external_dep-0.1-1.rockspec"
+         local foo_incdir = testing_paths.fixtures_dir .. "/with_external_dep"
          assert.is_truthy(run.luarocks_bool("build " .. rockspec .. " FOO_INCDIR=\"" .. foo_incdir .. "\""))
          assert.is.truthy(run.luarocks("show with_external_dep"))
       end)
diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index 6be586c2..fae68474 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
diff --git a/spec/deps_spec.lua b/spec/deps_spec.lua
index 8c4effcd..76ee68a7 100644
--- a/spec/deps_spec.lua
+++ b/spec/deps_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
diff --git a/spec/doc_spec.lua b/spec/doc_spec.lua
index ea42cd6b..5f503af2 100644
--- a/spec/doc_spec.lua
+++ b/spec/doc_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
diff --git a/spec/download_spec.lua b/spec/download_spec.lua
index 320d9304..64443922 100644
--- a/spec/download_spec.lua
+++ b/spec/download_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 
diff --git a/spec/fetch_spec.lua b/spec/fetch_spec.lua
index ab2cd54e..59f73b57 100644
--- a/spec/fetch_spec.lua
+++ b/spec/fetch_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 
 test_env.unload_luarocks()
 local fetch = require("luarocks.fetch")
diff --git a/test/testfiles/a_rock-1.0-1.rockspec b/spec/fixtures/a_rock-1.0-1.rockspec
index 9f15e87a..9f15e87a 100644
--- a/test/testfiles/a_rock-1.0-1.rockspec
+++ b/spec/fixtures/a_rock-1.0-1.rockspec
diff --git a/test/testfiles/a_rock.lua b/spec/fixtures/a_rock.lua
index a5647075..a5647075 100644
--- a/test/testfiles/a_rock.lua
+++ b/spec/fixtures/a_rock.lua
diff --git a/test/testfiles/invalid_patch-0.1-1.rockspec b/spec/fixtures/invalid_patch-0.1-1.rockspec
index c2ecd160..c2ecd160 100644
--- a/test/testfiles/invalid_patch-0.1-1.rockspec
+++ b/spec/fixtures/invalid_patch-0.1-1.rockspec
diff --git a/test/testfiles/invalid_validate-args-1.5.4-1.rockspec b/spec/fixtures/invalid_validate-args-1.5.4-1.rockspec
index 0b4d807d..0b4d807d 100644
--- a/test/testfiles/invalid_validate-args-1.5.4-1.rockspec
+++ b/spec/fixtures/invalid_validate-args-1.5.4-1.rockspec
diff --git a/test/testfiles/luajit-fail-1.0-1.rockspec b/spec/fixtures/luajit-fail-1.0-1.rockspec
index f8204600..f8204600 100644
--- a/test/testfiles/luajit-fail-1.0-1.rockspec
+++ b/spec/fixtures/luajit-fail-1.0-1.rockspec
diff --git a/test/testfiles/luajit-success-1.0-1.rockspec b/spec/fixtures/luajit-success-1.0-1.rockspec
index 31c930c3..31c930c3 100644
--- a/test/testfiles/luajit-success-1.0-1.rockspec
+++ b/spec/fixtures/luajit-success-1.0-1.rockspec
diff --git a/test/testfiles/missing_external-0.1-1.rockspec b/spec/fixtures/missing_external-0.1-1.rockspec
index 5f8e6219..5f8e6219 100644
--- a/test/testfiles/missing_external-0.1-1.rockspec
+++ b/spec/fixtures/missing_external-0.1-1.rockspec
diff --git a/test/testfiles/mixed_deploy_type/mdt.c b/spec/fixtures/mixed_deploy_type/mdt.c
index a162ce23..a162ce23 100644
--- a/test/testfiles/mixed_deploy_type/mdt.c
+++ b/spec/fixtures/mixed_deploy_type/mdt.c
diff --git a/test/testfiles/mixed_deploy_type/mdt.lua b/spec/fixtures/mixed_deploy_type/mdt.lua
index c9ca9c68..c9ca9c68 100644
--- a/test/testfiles/mixed_deploy_type/mdt.lua
+++ b/spec/fixtures/mixed_deploy_type/mdt.lua
diff --git a/test/testfiles/mixed_deploy_type/mdt_file b/spec/fixtures/mixed_deploy_type/mdt_file
index 1a15f7d7..1a15f7d7 100644
--- a/test/testfiles/mixed_deploy_type/mdt_file
+++ b/spec/fixtures/mixed_deploy_type/mdt_file
diff --git a/test/testfiles/mixed_deploy_type/mixed_deploy_type-0.1.0-1.rockspec b/spec/fixtures/mixed_deploy_type/mixed_deploy_type-0.1.0-1.rockspec
index 91b725da..91b725da 100644
--- a/test/testfiles/mixed_deploy_type/mixed_deploy_type-0.1.0-1.rockspec
+++ b/spec/fixtures/mixed_deploy_type/mixed_deploy_type-0.1.0-1.rockspec
diff --git a/test/testfiles/mixed_deploy_type/mixed_deploy_type-0.2.0-1.rockspec b/spec/fixtures/mixed_deploy_type/mixed_deploy_type-0.2.0-1.rockspec
index 9ca03180..9ca03180 100644
--- a/test/testfiles/mixed_deploy_type/mixed_deploy_type-0.2.0-1.rockspec
+++ b/spec/fixtures/mixed_deploy_type/mixed_deploy_type-0.2.0-1.rockspec
diff --git a/test/testfiles/no_build_table-0.1-1.rockspec b/spec/fixtures/no_build_table-0.1-1.rockspec
index 5d79e9a0..5d79e9a0 100644
--- a/test/testfiles/no_build_table-0.1-1.rockspec
+++ b/spec/fixtures/no_build_table-0.1-1.rockspec
diff --git a/test/testfiles/not_a_zipfile-1.0-1.src.rock b/spec/fixtures/not_a_zipfile-1.0-1.src.rock
index e36f8bbe..e36f8bbe 100644
--- a/test/testfiles/not_a_zipfile-1.0-1.src.rock
+++ b/spec/fixtures/not_a_zipfile-1.0-1.src.rock
diff --git a/spec/fixtures/patch_create_delete-0.1-1.rockspec b/spec/fixtures/patch_create_delete-0.1-1.rockspec
new file mode 100644
index 00000000..3d55da58
--- /dev/null
+++ b/spec/fixtures/patch_create_delete-0.1-1.rockspec
@@ -0,0 +1,34 @@
+rockspec_format = "3.0"
+package = "patch_create_delete"
+version = "0.1-1"
+source = {
+   -- any valid URL
+   url = "git://github.com/luarocks/luarocks"
+}
+description = {
+   summary = "A rockspec with a patch that creates and deletes files",
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   type = "builtin",
+   modules = {
+      ["luarocks.loader"] = "src/luarocks/loader.lua"
+   },
+   patches = {
+      ["create_delete.patch"] = 
+[[
+diff -Naur luarocks/spec/fixtures/patch_create_delete/a_file.txt luarocks-patch/spec/fixtures/patch_create_delete/a_file.txt
+--- luarocks/spec/fixtures/patch_create_delete/a_file.txt       2017-10-04 15:39:44.179306674 -0300
++++ luarocks-patch/spec/fixtures/patch_create_delete/a_file.txt 1969-12-31 21:00:00.000000000 -0300
+@@ -1 +0,0 @@
+-I am a file.
+diff -Naur luarocks/spec/fixtures/patch_create_delete/another_file.txt luarocks-patch/spec/fixtures/patch_create_delete/another_file.txt
+--- luarocks/spec/fixtures/patch_create_delete/another_file.txt 1969-12-31 21:00:00.000000000 -0300
++++ luarocks-patch/spec/fixtures/patch_create_delete/another_file.txt   2017-10-04 15:40:12.836306564 -0300
+@@ -0,0 +1 @@
++I am another file.
+]]
+   }
+}
diff --git a/test/testfiles/patch_create_delete/a_file.txt b/spec/fixtures/patch_create_delete/a_file.txt
index 6539c24e..6539c24e 100644
--- a/test/testfiles/patch_create_delete/a_file.txt
+++ b/spec/fixtures/patch_create_delete/a_file.txt
diff --git a/test/testfiles/type_mismatch_string-1.0-1.rockspec b/spec/fixtures/type_mismatch_string-1.0-1.rockspec
index 7a607cfd..7a607cfd 100644
--- a/test/testfiles/type_mismatch_string-1.0-1.rockspec
+++ b/spec/fixtures/type_mismatch_string-1.0-1.rockspec
diff --git a/test/testfiles/type_mismatch_table-1.0-1.rockspec b/spec/fixtures/type_mismatch_table-1.0-1.rockspec
index f348b798..f348b798 100644
--- a/test/testfiles/type_mismatch_table-1.0-1.rockspec
+++ b/spec/fixtures/type_mismatch_table-1.0-1.rockspec
diff --git a/test/testfiles/type_mismatch_version-1.0-1.rockspec b/spec/fixtures/type_mismatch_version-1.0-1.rockspec
index 5e30dae6..5e30dae6 100644
--- a/test/testfiles/type_mismatch_version-1.0-1.rockspec
+++ b/spec/fixtures/type_mismatch_version-1.0-1.rockspec
diff --git a/test/testfiles/with_external_dep-0.1-1.rockspec b/spec/fixtures/with_external_dep-0.1-1.rockspec
index 45fea4bd..45fea4bd 100644
--- a/test/testfiles/with_external_dep-0.1-1.rockspec
+++ b/spec/fixtures/with_external_dep-0.1-1.rockspec
diff --git a/test/testfiles/with_external_dep.c b/spec/fixtures/with_external_dep.c
index 16435d8f..16435d8f 100644
--- a/test/testfiles/with_external_dep.c
+++ b/spec/fixtures/with_external_dep.c
diff --git a/test/testfiles/with_external_dep/foo/foo.h b/spec/fixtures/with_external_dep/foo/foo.h
index eedd558f..eedd558f 100644
--- a/test/testfiles/with_external_dep/foo/foo.h
+++ b/spec/fixtures/with_external_dep/foo/foo.h
diff --git a/test/testfiles/with_external_dep/foo/foo.h.gch b/spec/fixtures/with_external_dep/foo/foo.h.gch
index 66165c9e..66165c9e 100644
--- a/test/testfiles/with_external_dep/foo/foo.h.gch
+++ b/spec/fixtures/with_external_dep/foo/foo.h.gch
diff --git a/spec/fs_spec.lua b/spec/fs_spec.lua
index c76f47a4..17ac90ab 100644
--- a/spec/fs_spec.lua
+++ b/spec/fs_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 
 test_env.unload_luarocks()
 local fs = require("luarocks.fs")
diff --git a/spec/help_spec.lua b/spec/help_spec.lua
index 71b1b9f6..f7bb79b3 100644
--- a/spec/help_spec.lua
+++ b/spec/help_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 
 test_env.unload_luarocks()
diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index 92b780d3..d72d88ba 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
@@ -43,7 +43,7 @@ describe("LuaRocks install tests #blackbox #b_install", function()
       end)
 
       it("LuaRocks install invalid patch", function()
-         assert.is_false(run.luarocks_bool("install " .. testing_paths.testing_dir .. "/testfiles/invalid_patch-0.1-1.rockspec"))
+         assert.is_false(run.luarocks_bool("install " .. testing_paths.fixtures_dir .. "/invalid_patch-0.1-1.rockspec"))
       end)      
 
       it("LuaRocks install invalid rock", function()
@@ -55,7 +55,7 @@ describe("LuaRocks install tests #blackbox #b_install", function()
       end)
 
       it("LuaRocks install not a zip file", function()
-         assert.is_false(run.luarocks_bool("install " .. testing_paths.testing_dir .. "/testfiles/not_a_zipfile-1.0-1.src.rock"))
+         assert.is_false(run.luarocks_bool("install " .. testing_paths.fixtures_dir .. "/not_a_zipfile-1.0-1.src.rock"))
       end)
 
       it("LuaRocks install only-deps of lxsh show there is no lxsh", function()
diff --git a/spec/lint_spec.lua b/spec/lint_spec.lua
index f7496037..1c082b2a 100644
--- a/spec/lint_spec.lua
+++ b/spec/lint_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
@@ -31,19 +31,19 @@ describe("LuaRocks lint tests #blackbox #b_lint", function()
    
    describe("LuaRocks lint mismatch set", function()
       it("LuaRocks lint mismatch string", function()
-         assert.is_false(run.luarocks_bool("lint " .. testing_paths.testing_dir .. "/testfiles/type_mismatch_string-1.0-1.rockspec"))
+         assert.is_false(run.luarocks_bool("lint " .. testing_paths.fixtures_dir .. "/type_mismatch_string-1.0-1.rockspec"))
       end)
    
       it("LuaRocks lint mismatch version", function()
-         assert.is_false(run.luarocks_bool("lint " .. testing_paths.testing_dir .. "/testfiles/type_mismatch_version-1.0-1.rockspec"))
+         assert.is_false(run.luarocks_bool("lint " .. testing_paths.fixtures_dir .. "/type_mismatch_version-1.0-1.rockspec"))
       end)
    
       it("LuaRocks lint mismatch table", function()
-         assert.is_false(run.luarocks_bool("lint " .. testing_paths.testing_dir .. "/testfiles/type_mismatch_table-1.0-1.rockspec"))
+         assert.is_false(run.luarocks_bool("lint " .. testing_paths.fixtures_dir .. "/type_mismatch_table-1.0-1.rockspec"))
       end)
    
       it("LuaRocks lint mismatch no build table", function()
-         assert.is_false(run.luarocks_bool("lint " .. testing_paths.testing_dir .. "/testfiles/no_build_table-1.0-1.rockspec"))
+         assert.is_false(run.luarocks_bool("lint " .. testing_paths.fixtures_dir .. "/no_build_table-1.0-1.rockspec"))
       end)
    end)
 end)
diff --git a/spec/list_spec.lua b/spec/list_spec.lua
index b9a8e4c4..9f221b90 100644
--- a/spec/list_spec.lua
+++ b/spec/list_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
diff --git a/spec/make_manifest_spec.lua b/spec/make_manifest_spec.lua
index 3e998cbf..2b109fa7 100644
--- a/spec/make_manifest_spec.lua
+++ b/spec/make_manifest_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 
 test_env.unload_luarocks()
diff --git a/spec/make_spec.lua b/spec/make_spec.lua
index 4c406c68..88b35b22 100644
--- a/spec/make_spec.lua
+++ b/spec/make_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
@@ -102,7 +102,7 @@ describe("LuaRocks make tests #blackbox #b_make", function()
 
    describe("LuaRocks make upgrading rockspecs with mixed deploy types", function()
       before_each(function()
-         test_env.copy_dir(testing_paths.testing_dir .. "/testfiles/mixed_deploy_type", "mdt")
+         test_env.copy_dir(testing_paths.fixtures_dir .. "/mixed_deploy_type", "mdt")
       end)
 
       after_each(function()
diff --git a/spec/new_version_spec.lua b/spec/new_version_spec.lua
index 2f67141d..65f60dd6 100644
--- a/spec/new_version_spec.lua
+++ b/spec/new_version_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua
index 0c6dd8f2..966195c5 100644
--- a/spec/pack_spec.lua
+++ b/spec/pack_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
@@ -30,7 +30,7 @@ describe("LuaRocks pack tests #blackbox #b_pack", function()
    end)
 
    it("LuaRocks pack invalid rockspec", function()
-      assert.is_false(run.luarocks_bool("pack " .. testing_paths.testing_dir .. "/testfiles/invaild_validate-args-1.5.4-1.rockspec"))
+      assert.is_false(run.luarocks_bool("pack " .. testing_paths.fixtures_dir .. "/invaild_validate-args-1.5.4-1.rockspec"))
    end)
 
    it("LuaRocks pack not installed rock", function()
diff --git a/spec/path_spec.lua b/spec/path_spec.lua
index 536233b1..bbc0cfc8 100644
--- a/spec/path_spec.lua
+++ b/spec/path_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 
 test_env.unload_luarocks()
diff --git a/spec/persist.lua b/spec/persist.lua
index 6b69dab4..00a9b75d 100644
--- a/spec/persist.lua
+++ b/spec/persist.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 
 test_env.unload_luarocks()
 local persist = require("luarocks.persist")
diff --git a/spec/purge_spec.lua b/spec/purge_spec.lua
index 20cee5f0..79ad0dfd 100644
--- a/spec/purge_spec.lua
+++ b/spec/purge_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
diff --git a/spec/refresh_cache_spec.lua b/spec/refresh_cache_spec.lua
index 09f5645e..51c1572f 100644
--- a/spec/refresh_cache_spec.lua
+++ b/spec/refresh_cache_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 
 test_env.unload_luarocks()
diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua
index 4d3f5cdc..c0e9beb0 100644
--- a/spec/remove_spec.lua
+++ b/spec/remove_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
diff --git a/spec/search_spec.lua b/spec/search_spec.lua
index 04f84eeb..952458dd 100644
--- a/spec/search_spec.lua
+++ b/spec/search_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 
 test_env.unload_luarocks()
diff --git a/spec/show_spec.lua b/spec/show_spec.lua
index 0b046de0..d572be9b 100644
--- a/spec/show_spec.lua
+++ b/spec/show_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 
 test_env.unload_luarocks()
diff --git a/spec/unpack_spec.lua b/spec/unpack_spec.lua
index d629e225..fc02d853 100644
--- a/spec/unpack_spec.lua
+++ b/spec/unpack_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
@@ -26,7 +26,7 @@ describe("LuaRocks unpack tests #blackbox #b_unpack", function()
       end)
       
       it("LuaRocks unpack with invalid patch", function()
-         assert.is_false(run.luarocks_bool("unpack " .. testing_paths.testing_dir .. "/testfiles/invalid_patch-0.1-1.rockspec"))
+         assert.is_false(run.luarocks_bool("unpack " .. testing_paths.fixtures_dir .. "/invalid_patch-0.1-1.rockspec"))
       end)
    end)
 
diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index b8e147e0..3adfa2dd 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 
@@ -39,10 +39,10 @@ describe("LuaRocks upload tests #blackbox #b_upload", function()
       after_each(test_env.mock_server_done)
 
       it("LuaRocks upload rockspec with api-key", function()
-         assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_dir .. "/testfiles/a_rock-1.0-1.rockspec " .. test_env.OPENSSL_DIRS .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"}))
+         assert.is_true(run.luarocks_bool("upload " .. testing_paths.fixtures_dir .. "/a_rock-1.0-1.rockspec " .. test_env.OPENSSL_DIRS .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testrun_dir .. "/luarocks_site.lua"}))
       end)
       it("LuaRocks upload rockspec with api-key and skip-pack", function()
-         assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.testing_dir .. "/testfiles/a_rock-1.0-1.rockspec " .. test_env.OPENSSL_DIRS .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"}))
+         assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.fixtures_dir .. "/a_rock-1.0-1.rockspec " .. test_env.OPENSSL_DIRS .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testrun_dir .. "/luarocks_site.lua"}))
       end)
    end)
 end)
diff --git a/test/mock-server.lua b/spec/util/mock-server.lua
index dbbdea2c..244aceae 100644
--- a/test/mock-server.lua
+++ b/spec/util/mock-server.lua
@@ -70,7 +70,7 @@ server:add_resource("/file/{name:[^/]+}", {
       path = "/",
       produces = "text/plain",
       handler = function(query, name)
-         local fd = io.open("test/testfiles/"..name, "r")
+         local fd = io.open("spec/fixtures/"..name, "r")
          if not fd then
             return restserver.response():status(404)
          end
diff --git a/test/test_environment.lua b/spec/util/test_env.lua
index d347fa59..9d9ae843 100644
--- a/test/test_environment.lua
+++ b/spec/util/test_env.lua
@@ -346,7 +346,7 @@ local function create_env(testing_paths)
    
    local env_variables = {}
    env_variables.LUA_VERSION = luaversion_short
-   env_variables.LUAROCKS_CONFIG = testing_paths.testing_dir .. "/testing_config.lua"
+   env_variables.LUAROCKS_CONFIG = testing_paths.testrun_dir .. "/testing_config.lua"
    if test_env.TEST_TARGET_OS == "windows" then
       env_variables.LUA_PATH = testing_paths.testing_lrprefix .. "\\lua\\?.lua;"
    else
@@ -379,7 +379,7 @@ local function make_run_function(cmd_name, exec_function, with_coverage, do_prin
    local cmd_prefix = Q(test_env.testing_paths.lua) .. " "
 
    if with_coverage then
-      cmd_prefix = cmd_prefix .. "-e \"require('luacov.runner')('" .. test_env.testing_paths.testing_dir .. "/luacov.config')\" "
+      cmd_prefix = cmd_prefix .. "-e \"require('luacov.runner')('" .. test_env.testing_paths.testrun_dir .. "/luacov.config')\" "
    end
    
    if test_env.TEST_TARGET_OS == "windows" then
@@ -482,15 +482,17 @@ local function create_paths(luaversion_full)
       testing_paths.luarocks_dir = testing_paths.luarocks_dir:gsub("\\","/")
    end
 
-   testing_paths.testing_dir = testing_paths.luarocks_dir .. "/test"
+   testing_paths.fixtures_dir = testing_paths.luarocks_dir .. "/spec/fixtures"
+   testing_paths.util_dir = testing_paths.luarocks_dir .. "/spec/util"
+   testing_paths.testrun_dir = testing_paths.luarocks_dir .. "/testrun"
    testing_paths.src_dir = testing_paths.luarocks_dir .. "/src"
-   testing_paths.testing_lrprefix = testing_paths.testing_dir .. "/testing_lrprefix-" .. luaversion_full
-   testing_paths.testing_tree = testing_paths.testing_dir .. "/testing-" .. luaversion_full
-   testing_paths.testing_tree_copy = testing_paths.testing_dir .. "/testing_copy-" .. luaversion_full
-   testing_paths.testing_sys_tree = testing_paths.testing_dir .. "/testing_sys-" .. luaversion_full
-   testing_paths.testing_sys_tree_copy = testing_paths.testing_dir .. "/testing_sys_copy-" .. luaversion_full
-   testing_paths.testing_cache = testing_paths.testing_dir .. "/testing_cache-" .. luaversion_full
-   testing_paths.testing_server = testing_paths.testing_dir .. "/testing_server-" .. luaversion_full
+   testing_paths.testing_lrprefix = testing_paths.testrun_dir .. "/testing_lrprefix-" .. luaversion_full
+   testing_paths.testing_tree = testing_paths.testrun_dir .. "/testing-" .. luaversion_full
+   testing_paths.testing_tree_copy = testing_paths.testrun_dir .. "/testing_copy-" .. luaversion_full
+   testing_paths.testing_sys_tree = testing_paths.testrun_dir .. "/testing_sys-" .. luaversion_full
+   testing_paths.testing_sys_tree_copy = testing_paths.testrun_dir .. "/testing_sys_copy-" .. luaversion_full
+   testing_paths.testing_cache = testing_paths.testrun_dir .. "/testing_cache-" .. luaversion_full
+   testing_paths.testing_server = testing_paths.testrun_dir .. "/testing_server-" .. luaversion_full
 
    testing_paths.testing_rocks = testing_paths.testing_tree .. "/lib/luarocks/rocks-" .. test_env.lua_version
    testing_paths.testing_sys_rocks = testing_paths.testing_sys_tree .. "/lib/luarocks/rocks-" .. test_env.lua_version
@@ -609,8 +611,8 @@ local function create_configs()
       testing_cache = test_env.testing_paths.testing_cache
    })
 
-   write_file(test_env.testing_paths.testing_dir .. "/testing_config.lua", config_content .. " \nweb_browser = \"true\"")
-   write_file(test_env.testing_paths.testing_dir .. "/testing_config_show_downloads.lua", config_content
+   write_file(test_env.testing_paths.testrun_dir .. "/testing_config.lua", config_content .. " \nweb_browser = \"true\"")
+   write_file(test_env.testing_paths.testrun_dir .. "/testing_config_show_downloads.lua", config_content
                   .. "show_downloads = true \n rocks_servers={\"http://luarocks.org/repositories/rocks\"}")
 
    -- testing_config_sftp.lua
@@ -634,13 +636,13 @@ local function create_configs()
       testing_cache = test_env.testing_paths.testing_cache
    })
 
-   write_file(test_env.testing_paths.testing_dir .. "/testing_config_sftp.lua", config_content)
+   write_file(test_env.testing_paths.testrun_dir .. "/testing_config_sftp.lua", config_content)
 
    -- luacov.config
    config_content = substitute([[
       return {
-         statsfile = "%{testing_dir}/luacov.stats.out",
-         reportfile = "%{testing_dir}/luacov.report.out",
+         statsfile = "%{testrun_dir}/luacov.stats.out",
+         reportfile = "%{testrun_dir}/luacov.report.out",
          modules = {
             ["luarocks"] = "src/bin/luarocks",
             ["luarocks-admin"] = "src/bin/luarocks-admin",
@@ -650,20 +652,31 @@ local function create_configs()
          }
       }
    ]], {
-      testing_dir = test_env.testing_paths.testing_dir
+      testrun_dir = test_env.testing_paths.testrun_dir
    })
 
-   write_file(test_env.testing_paths.testing_dir .. "/luacov.config", config_content)
+   write_file(test_env.testing_paths.testrun_dir .. "/luacov.config", config_content)
+
+   config_content = [[
+      -- Config file of mock LuaRocks.org site for tests
+      upload = {
+         server = "http://localhost:8080",
+         tool_version = "1.0.0",
+         api_version = "1",
+      }
+   ]]
+   write_file(test_env.testing_paths.testrun_dir .. "/luarocks_site.lua", config_content)
 end
 
 --- Remove testing directories.
 local function clean()
    print("Cleaning testing directory...")
    test_env.remove_dir(test_env.testing_paths.luarocks_tmp)
-   test_env.remove_subdirs(test_env.testing_paths.testing_dir, "testing[_%-]")
-   test_env.remove_files(test_env.testing_paths.testing_dir, "testing_")
-   test_env.remove_files(test_env.testing_paths.testing_dir, "luacov")
-   test_env.remove_files(test_env.testing_paths.testing_dir, "upload_config")
+   test_env.remove_subdirs(test_env.testing_paths.testrun_dir, "testing[_%-]")
+   test_env.remove_files(test_env.testing_paths.testrun_dir, "testing_")
+   test_env.remove_files(test_env.testing_paths.testrun_dir, "luacov")
+   test_env.remove_files(test_env.testing_paths.testrun_dir, "upload_config")
+   test_env.remove_files(test_env.testing_paths.testrun_dir, "luarocks_site")
    print("Cleaning done!")
 end
 
@@ -714,7 +727,7 @@ function test_env.mock_server_init()
    local assert = require("luassert")
    local testing_paths = test_env.testing_paths
    assert.is_true(test_env.need_rock("restserver-xavante"))
-   local final_command = test_env.execute_helper(testing_paths.lua .. " " .. testing_paths.testing_dir .. "/mock-server.lua &", true, test_env.env_variables)
+   local final_command = test_env.execute_helper(testing_paths.lua .. " " .. testing_paths.util_dir .. "/mock-server.lua &", true, test_env.env_variables)
    os.execute(final_command)
 end
 
@@ -731,13 +744,14 @@ function test_env.main()
       clean()
    end
 
+   lfs.mkdir(testing_paths.testrun_dir)
    lfs.mkdir(testing_paths.testing_cache)
    lfs.mkdir(testing_paths.luarocks_tmp)
 
    create_configs()
 
    local install_env_vars = {
-      LUAROCKS_CONFIG = test_env.testing_paths.testing_dir .. "/testing_config.lua"
+      LUAROCKS_CONFIG = test_env.testing_paths.testrun_dir .. "/testing_config.lua"
    }
 
    install_luarocks(install_env_vars)
diff --git a/spec/util_spec.lua b/spec/util_spec.lua
index 25cc51d8..3aa8fbf5 100644
--- a/spec/util_spec.lua
+++ b/spec/util_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
diff --git a/spec/write_rockspec_spec.lua b/spec/write_rockspec_spec.lua
index 0c860939..9ee86ada 100644
--- a/spec/write_rockspec_spec.lua
+++ b/spec/write_rockspec_spec.lua
@@ -1,4 +1,4 @@
-local test_env = require("test/test_environment")
+local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 
@@ -27,28 +27,28 @@ describe("LuaRocks write_rockspec tests #blackbox #b_write_rockspec", function()
 
    describe("LuaRocks write_rockspec more complex tests", function()
       it("LuaRocks write_rockspec git luarocks", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/keplerproject/luarocks"))
-         assert.is.truthy(lfs.attributes("luarocks-dev-1.rockspec"))
-         assert.is_true(os.remove("luarocks-dev-1.rockspec"))
+         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/testrock"))
+         assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
+         assert.is_true(os.remove("testrock-dev-1.rockspec"))
       end)
       
       it("LuaRocks write_rockspec git luarocks --tag=v2.3.0", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/keplerproject/luarocks --tag=v2.3.0"))
-         assert.is.truthy(lfs.attributes("luarocks-2.3.0-1.rockspec"))
-         assert.is_true(os.remove("luarocks-2.3.0-1.rockspec"))
+         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/testrock --tag=v2.3.0"))
+         assert.is.truthy(lfs.attributes("testrock-2.3.0-1.rockspec"))
+         assert.is_true(os.remove("testrock-2.3.0-1.rockspec"))
       end)
       
       it("LuaRocks write_rockspec git luarocks with format flag", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/luarocks --rockspec-format=1.1 --lua-version=5.1,5.2"))
-         assert.is.truthy(lfs.attributes("luarocks-dev-1.rockspec"))
-         assert.is_true(os.remove("luarocks-dev-1.rockspec"))
+         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/testrock --rockspec-format=1.1 --lua-version=5.1,5.2"))
+         assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
+         assert.is_true(os.remove("testrock-dev-1.rockspec"))
       end)
       
       it("LuaRocks write_rockspec git luarocks with full flags", function()
-         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/luarocks --lua-version=5.1,5.2 --license=\"MIT/X11\" "
+         assert.is_true(run.luarocks_bool("write_rockspec git://github.com/luarocks/testrock --lua-version=5.1,5.2 --license=\"MIT/X11\" "
                                              .. " --homepage=\"http://www.luarocks.org\" --summary=\"A package manager for Lua modules\" "))
-         assert.is.truthy(lfs.attributes("luarocks-dev-1.rockspec"))
-         assert.is_true(os.remove("luarocks-dev-1.rockspec"))
+         assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
+         assert.is_true(os.remove("testrock-dev-1.rockspec"))
       end)
       
       it("LuaRocks write_rockspec rockspec via http", function()
diff --git a/test/luarocks_site.lua b/test/luarocks_site.lua
deleted file mode 100644
index cfa77dca..00000000
--- a/test/luarocks_site.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- Config file of LuaRocks site for tests
-upload = {
-   server = "http://localhost:8080",
-   tool_version = "1.0.0",
-   api_version = "1",
-}
\ No newline at end of file
diff --git a/test/testfiles/patch_create_delete-0.1-1.rockspec b/test/testfiles/patch_create_delete-0.1-1.rockspec
deleted file mode 100644
index 069e2912..00000000
--- a/test/testfiles/patch_create_delete-0.1-1.rockspec
+++ /dev/null
@@ -1,34 +0,0 @@
-rockspec_format = "3.0"
-package = "patch_create_delete"
-version = "0.1-1"
-source = {
-   -- any valid URL
-   url = "git://github.com/luarocks/luarocks"
-}
-description = {
-   summary = "A rockspec with a patch that creates and deletes files",
-}
-dependencies = {
-   "lua >= 5.1"
-}
-build = {
-   type = "builtin",
-   modules = {
-      ["luarocks.loader"] = "src/luarocks/loader.lua"
-   },
-   patches = {
-      ["create_delete.patch"] = 
-[[
-diff -Naur luarocks/test/testfiles/patch_create_delete/a_file.txt luarocks-patch/test/testfiles/patch_create_delete/a_file.txt
---- luarocks/test/testfiles/patch_create_delete/a_file.txt      2017-10-04 15:39:44.179306674 -0300
-+++ luarocks-patch/test/testfiles/patch_create_delete/a_file.txt        1969-12-31 21:00:00.000000000 -0300
-@@ -1 +0,0 @@
--I am a file.
-diff -Naur luarocks/test/testfiles/patch_create_delete/another_file.txt luarocks-patch/test/testfiles/patch_create_delete/another_file.txt
---- luarocks/test/testfiles/patch_create_delete/another_file.txt        1969-12-31 21:00:00.000000000 -0300
-+++ luarocks-patch/test/testfiles/patch_create_delete/another_file.txt  2017-10-04 15:40:12.836306564 -0300
-@@ -0,0 +1 @@
-+I am another file.
-]]
-   }
-}