diff --git a/spec/unit/autosuspend_spec.lua b/spec/unit/autosuspend_spec.lua
index 79745306c..a99952910 100644
--- a/spec/unit/autosuspend_spec.lua
+++ b/spec/unit/autosuspend_spec.lua
@@ -1,7 +1,6 @@
 describe("AutoSuspend", function()
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
     end)
 
diff --git a/spec/unit/batterystat_spec.lua b/spec/unit/batterystat_spec.lua
index a2b70c774..0453c1c93 100644
--- a/spec/unit/batterystat_spec.lua
+++ b/spec/unit/batterystat_spec.lua
@@ -7,7 +7,6 @@ describe("BatteryState plugin tests", function()
 
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
         time = require("ui/time")
         MockTime = require("mock_time")
@@ -16,7 +15,6 @@ describe("BatteryState plugin tests", function()
 
     teardown(function()
         MockTime:uninstall()
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
     end)
 
diff --git a/spec/unit/commonrequire.lua b/spec/unit/commonrequire.lua
index c79d80a3c..da3b55b86 100644
--- a/spec/unit/commonrequire.lua
+++ b/spec/unit/commonrequire.lua
@@ -56,30 +56,3 @@ package.reload = function(name)
     assert(package.unload(name))
     return require(name)
 end
-
-package.unloadAll = function()
-    local candidates = {
-        "spec/",
-        "frontend/",
-        "plugins/",
-        "datastorage.lua",
-        "defaults.lua",
-    }
-    local pending = {}
-    for name, _ in pairs(package.loaded) do
-        local path = package.searchpath(name, package.path)
-        if path ~= nil then
-            for _, candidate in ipairs(candidates) do
-                if path:find(candidate) == 1 then
-                    table.insert(pending, name)
-                end
-            end
-        end
-    end
-    for _, name in ipairs(pending) do
-        if name ~= "commonrequire" then
-            assert(package.unload(name))
-        end
-    end
-    return #pending
-end
diff --git a/spec/unit/device_spec.lua b/spec/unit/device_spec.lua
index c1ee7953e..da73e7d6f 100644
--- a/spec/unit/device_spec.lua
+++ b/spec/unit/device_spec.lua
@@ -31,7 +31,6 @@ describe("device module", function()
             end
         }
         require("commonrequire")
-        package.unloadAll()
         ffi = require("ffi")
         C = ffi.C
         require("ffi/linux_input_h")
diff --git a/spec/unit/filemanager_spec.lua b/spec/unit/filemanager_spec.lua
index 6776a381a..49e50e496 100644
--- a/spec/unit/filemanager_spec.lua
+++ b/spec/unit/filemanager_spec.lua
@@ -2,7 +2,6 @@ describe("FileManager module", function()
     local DataStorage, FileManager, lfs, docsettings, UIManager, Screen, makePath, util
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
         DataStorage = require("datastorage")
         FileManager = require("apps/filemanager/filemanager")
diff --git a/spec/unit/frontlight_spec.lua b/spec/unit/frontlight_spec.lua
index f3412f43a..1105f8e25 100644
--- a/spec/unit/frontlight_spec.lua
+++ b/spec/unit/frontlight_spec.lua
@@ -3,7 +3,6 @@ describe("Frontlight function in PowerD", function()
     local param, test_when_on, test_when_off
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
 
         PowerD = require("device/generic/powerd"):new{
@@ -28,7 +27,6 @@ describe("Frontlight function in PowerD", function()
     end)
 
     teardown(function()
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
     end)
 
diff --git a/spec/unit/readerfooter_spec.lua b/spec/unit/readerfooter_spec.lua
index 529a8ad43..05ace680b 100644
--- a/spec/unit/readerfooter_spec.lua
+++ b/spec/unit/readerfooter_spec.lua
@@ -10,7 +10,6 @@ describe("Readerfooter module", function()
 
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         local Device = require("device")
         -- Override powerd for running tests on devices with batteries.
         Device.powerd.isChargingHW = function() return false end
diff --git a/spec/unit/readerhighlight_spec.lua b/spec/unit/readerhighlight_spec.lua
index 503a62d99..d97452e4d 100644
--- a/spec/unit/readerhighlight_spec.lua
+++ b/spec/unit/readerhighlight_spec.lua
@@ -4,7 +4,6 @@ describe("Readerhighlight module", function()
 
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
         DataStorage = require("datastorage")
         DocumentRegistry = require("document/documentregistry")
diff --git a/spec/unit/readerlink_spec.lua b/spec/unit/readerlink_spec.lua
index 56ccc21a6..58760ba4e 100644
--- a/spec/unit/readerlink_spec.lua
+++ b/spec/unit/readerlink_spec.lua
@@ -3,7 +3,6 @@ describe("ReaderLink module", function()
 
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
         DocumentRegistry = require("document/documentregistry")
         Event = require("ui/event")
diff --git a/spec/unit/readerview_spec.lua b/spec/unit/readerview_spec.lua
index cb5acd7a7..63c131ce4 100644
--- a/spec/unit/readerview_spec.lua
+++ b/spec/unit/readerview_spec.lua
@@ -3,7 +3,6 @@ describe("Readerview module", function()
 
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         require("document/canvascontext"):init(require("device"))
         DocumentRegistry = require("document/documentregistry")
         Blitbuffer = require("ffi/blitbuffer")
diff --git a/spec/unit/wakeupmgr_spec.lua b/spec/unit/wakeupmgr_spec.lua
index 08e6fe553..f84cedc44 100644
--- a/spec/unit/wakeupmgr_spec.lua
+++ b/spec/unit/wakeupmgr_spec.lua
@@ -5,7 +5,6 @@ describe("WakeupMgr", function()
 
     setup(function()
         require("commonrequire")
-        package.unloadAll()
         RTC = require("ffi/rtc")
         WakeupMgr = require("device/wakeupmgr"):new{}
         -- We could theoretically test this by running the tests as root locally.