4 files changed, 8 insertions, 0 deletions
diff --git a/test/mkmf/base.rb b/test/mkmf/base.rb
index 54f2e7a6be..9841aa3e48 100644
--- a/test/mkmf/base.rb
+++ b/test/mkmf/base.rb
@@ -107,8 +107,10 @@ class TestMkmf < Test::Unit::TestCase
     }
     Logging.quiet = @quiet
     Logging.log_close
+    FileUtils.rm_f("mkmf.log")
     Dir.chdir(@curdir)
     FileUtils.rm_rf(@tmpdir)
+    assert_empty(Dir.glob("conftest*") - %w[. ..])
   end
 
   def mkmf(*args, &block)
diff --git a/test/mkmf/test_convertible.rb b/test/mkmf/test_convertible.rb
index 3ad36b3c6b..eec2d12c66 100644
--- a/test/mkmf/test_convertible.rb
+++ b/test/mkmf/test_convertible.rb
@@ -27,6 +27,8 @@ class TestMkmf
           assert_include($defs, "-DNUM2TEST1T=NUM2#{u}#{type.upcase}")
         end
       end
+    ensure
+      File.unlink("confdefs.h")
     end
   end
 end
diff --git a/test/mkmf/test_signedness.rb b/test/mkmf/test_signedness.rb
index ad0495a2b5..8d58073698 100644
--- a/test/mkmf/test_signedness.rb
+++ b/test/mkmf/test_signedness.rb
@@ -22,6 +22,8 @@ class TestMkmf
           assert_include($defs, "-DSIGNEDNESS_OF_TEST1_T=#{expect}")
         end
       end
+    ensure
+      File.unlink("confdefs.h")
     end
   end
 end
diff --git a/test/mkmf/test_sizeof.rb b/test/mkmf/test_sizeof.rb
index 30f6fd5400..c0144226d5 100644
--- a/test/mkmf/test_sizeof.rb
+++ b/test/mkmf/test_sizeof.rb
@@ -40,6 +40,8 @@ class TestMkmf
         f.puts "typedef struct {int x, y;} test1_t;"
       }
       assert_equal(2 * @sizeof_int, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
+    ensure
+      File.unlink("confdefs.h")
     end
   end
 end