1 files changed, 9 insertions, 5 deletions
diff --git a/cpp/test/Freeze/cursor/run.py b/cpp/test/Freeze/cursor/run.py
index 57b9c63aa8d..30b4dca26db 100755
--- a/cpp/test/Freeze/cursor/run.py
+++ b/cpp/test/Freeze/cursor/run.py
@@ -12,18 +12,22 @@
 import os, sys
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    if os.path.exists(os.path.normpath(toplevel + "/config/TestUtil.py")):
+    if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
         break
 else:
     raise "can't find toplevel directory!"
 
-sys.path.append(os.path.normpath(toplevel + "/config"))
+sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
-name = "Freeze/cursor"
+name = os.path.join("Freeze", "cursor")
 
-testdir = os.path.normpath(toplevel + "/test/" + name)
-client = os.path.normpath(testdir + "/client")
+testdir = os.path.join(toplevel, "test", name)
+
+dbdir = os.path.join(testdir, "db")
+TestUtil.cleanDbDir(dbdir)
+
+client = os.path.join(testdir, "client")
 clientOptions = ' ' + testdir;
 
 print "starting client...",