diff --git a/pkg/middlewares/accesslog/logger_test.go b/pkg/middlewares/accesslog/logger_test.go
index 228599c72..62d6cef73 100644
--- a/pkg/middlewares/accesslog/logger_test.go
+++ b/pkg/middlewares/accesslog/logger_test.go
@@ -44,8 +44,9 @@ func TestLogRotation(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error setting up temporary directory: %s", err)
 	}
+	defer os.RemoveAll(tempDir)
 
-	fileName := tempDir + "traefik.log"
+	fileName := filepath.Join(tempDir, "traefik.log")
 	rotatedFileName := fileName + ".rotated"
 
 	config := &types.AccessLog{FilePath: fileName, Format: CommonFormat}
@@ -585,6 +586,7 @@ func captureStdout(t *testing.T) (out *os.File, restoreStdout func()) {
 
 	restoreStdout = func() {
 		os.Stdout = original
+		os.RemoveAll(file.Name())
 	}
 
 	return file, restoreStdout
diff --git a/pkg/provider/file/file_test.go b/pkg/provider/file/file_test.go
index 326448035..2c1b90b8a 100644
--- a/pkg/provider/file/file_test.go
+++ b/pkg/provider/file/file_test.go
@@ -254,7 +254,7 @@ func createProvider(t *testing.T, test ProvideTestCase, watch bool) (*Provider,
 	}
 
 	return provider, func() {
-		os.Remove(tempDir)
+		os.RemoveAll(tempDir)
 	}
 }
 
@@ -340,7 +340,7 @@ func createTLS(n int) string {
 
 func TestTLSContent(t *testing.T) {
 	tempDir := createTempDir(t, "testdir")
-	defer os.Remove(tempDir)
+	defer os.RemoveAll(tempDir)
 
 	fileTLS := createRandomFile(t, tempDir, "CONTENT")
 	fileConfig := createRandomFile(t, tempDir, `