4 files changed, 8 insertions, 1 deletions

diff --git a/spec/fetch_spec.lua b/spec/fetch_spec.lua
index ce4cfb56..6e00bc22 100644
--- a/spec/fetch_spec.lua
+++ b/spec/fetch_spec.lua
@@ -3,6 +3,7 @@ local git_repo = require("spec.util.git_repo")
 
 test_env.unload_luarocks()
 test_env.setup_specs()
+local fs = require("luarocks.fs")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local path = require("luarocks.path")
@@ -20,6 +21,7 @@ describe("Luarocks fetch test #unit #mock", function()
    local runner
    
    setup(function()
+      fs.init()
       test_env.mock_server_init()
 
       runner = require("luacov.runner")
diff --git a/spec/fs_spec.lua b/spec/fs_spec.lua
index 9b2aa01b..b8091f75 100644
--- a/spec/fs_spec.lua
+++ b/spec/fs_spec.lua
@@ -55,6 +55,7 @@ describe("Luarocks fs test #unit", function()
    local runner
    
    setup(function()
+      fs.init()
       runner = require("luacov.runner")
       runner.init(testing_paths.testrun_dir .. "/luacov.config")
       runner.tick = true
diff --git a/spec/test_spec.lua b/spec/test_spec.lua
index 0111f89a..7a2399a9 100644
--- a/spec/test_spec.lua
+++ b/spec/test_spec.lua
@@ -82,6 +82,7 @@ end)
 test_env.unload_luarocks()
 
 local fs = require("luarocks.fs")
+local cfg = require("luarocks.core.cfg")
 local path = require("luarocks.path")
 local test = require("luarocks.test")
 local test_busted = require("luarocks.test.busted")
@@ -91,6 +92,8 @@ describe("LuaRocks test #unit", function()
    local runner
    
    setup(function()
+      cfg.init()
+      fs.init()
       runner = require("luacov.runner")
       runner.init(testing_paths.testrun_dir .. "/luacov.config")
       runner.tick = true
diff --git a/spec/tools_spec.lua b/spec/tools_spec.lua
index 8805d703..10dafb0b 100644
--- a/spec/tools_spec.lua
+++ b/spec/tools_spec.lua
@@ -5,7 +5,7 @@ local write_file = test_env.write_file
 
 test_env.unload_luarocks()
 local fs = require("luarocks.fs")
-local patch = package.loaded["luarocks.tools.patch"]
+local patch = require("luarocks.tools.patch")
 
 local lao = 
 [[The Nameless is the origin of Heaven and Earth;
@@ -148,6 +148,7 @@ describe("Luarocks patch test #unit", function()
    local runner
    
    setup(function()
+      fs.init()
       runner = require("luacov.runner")
       runner.init(testing_paths.testrun_dir .. "/luacov.config")
       runner.tick = true