diff --git a/test/central_directory_test.rb b/test/central_directory_test.rb
index a181a498..e8bcbfbf 100644
--- a/test/central_directory_test.rb
+++ b/test/central_directory_test.rb
@@ -2,6 +2,10 @@
 
 class ZipCentralDirectoryTest < MiniTest::Test
 
+  def teardown
+    ::Zip.reset!
+  end
+
   def test_read_from_stream
     ::File.open(TestZipFile::TEST_ZIP2.zip_name, "rb") {
         |zipFile|
diff --git a/test/entry_set_test.rb b/test/entry_set_test.rb
index d3c28386..c31157f0 100644
--- a/test/entry_set_test.rb
+++ b/test/entry_set_test.rb
@@ -14,6 +14,10 @@ def setup
     @zipEntrySet = ::Zip::EntrySet.new(ZIP_ENTRIES)
   end
 
+  def teardown
+    ::Zip.reset!
+  end
+
   def test_include
     assert(@zipEntrySet.include?(ZIP_ENTRIES.first))
     assert(!@zipEntrySet.include?(::Zip::Entry.new("different.zip", "different", "aComment")))
diff --git a/test/settings_test.rb b/test/settings_test.rb
index 4c185139..180625b7 100644
--- a/test/settings_test.rb
+++ b/test/settings_test.rb
@@ -13,6 +13,10 @@ def setup
     File.delete(TEST_OUT_NAME) if File.exist? TEST_OUT_NAME
   end
 
+  def teardown
+    ::Zip.reset!
+  end
+
   def open_zip(&aProc)
     assert(aProc != nil)
     ::Zip::File.open(TestZipFile::TEST_ZIP4.zip_name, &aProc)
diff --git a/test/zip64_full_test.rb b/test/zip64_full_test.rb
index 56dfa9d4..4e863a8c 100644
--- a/test/zip64_full_test.rb
+++ b/test/zip64_full_test.rb
@@ -8,6 +8,10 @@
 # this test does not, of course, run with the normal unit tests! ;)
 
   class Zip64FullTest < MiniTest::Test
+    def teardown
+      ::Zip.reset!
+    end
+
     def prepareTestFile(test_filename)
       ::File.delete(test_filename) if ::File.exist?(test_filename)
       return test_filename