diff --git a/test/plugin/test_in_tail.rb b/test/plugin/test_in_tail.rb
index 6edb9f38d6..cd8859d1a4 100644
--- a/test/plugin/test_in_tail.rb
+++ b/test/plugin/test_in_tail.rb
@@ -1609,7 +1609,6 @@ def test_unwatched_files_should_be_removed
         Fluent::FileWrapper.open("#{@tmp_dir}/tail.txt", "ab") { |f| f.puts "test3\n" }
       end
 
-      cleanup_directory(@tmp_dir)
       waiting(20) { sleep 0.1 until Dir.glob("#{@tmp_dir}/*.txt").size == 0 } # Ensure file is deleted on Windows
       waiting(5) { sleep 0.1 until d.instance.instance_variable_get(:@tails).keys.size <= 0 }
 
@@ -1625,6 +1624,7 @@ def test_unwatched_files_should_be_removed
       )
     ensure
       d.instance_shutdown if d && d.instance
+      cleanup_directory(@tmp_dir)
     end
 
     def count_timer_object