1 files changed, 2 insertions, 7 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 1758dc6131c..ca64d2f2c21 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -555,10 +555,5 @@ def collocatedTest(name):
     collocatedTestWithOptions(name, "")
 
 def cleanDbDir(path):
-
-    files = os.listdir(path)
-
-    for filename in files:
-        if filename != "CVS" and filename != ".dummy":
-            fullpath = os.path.join(path, filename);
-            os.remove(fullpath)
+    for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore"]:
+	os.remove(filename)