diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3f932f3c9..2a20af831f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.9.1 (Unreleased)
+
+BUG FIXES:
+
+* Binary acceptance test driver: fix cleanup of temporary directories [GH-378]
+
 # 1.9.0 (March 26, 2020)
 
 DEPRECATED:
diff --git a/helper/resource/testing.go b/helper/resource/testing.go
index 7b331d80d1..ecea64c615 100644
--- a/helper/resource/testing.go
+++ b/helper/resource/testing.go
@@ -108,10 +108,15 @@ func TestMain(m *testing.M) {
 			os.Exit(1)
 		}
 	} else {
+		exitCode := m.Run()
+
 		if acctest.TestHelper != nil {
-			defer acctest.TestHelper.Close()
+			err := acctest.TestHelper.Close()
+			if err != nil {
+				log.Printf("Error cleaning up temporary test files: %s", err)
+			}
 		}
-		os.Exit(m.Run())
+		os.Exit(exitCode)
 	}
 }