--- a/tests/test-convert-cvsnt-mergepoints.t	Thu Dec 25 21:50:35 2014 -0500
+++ b/tests/test-convert-cvsnt-mergepoints.t	Sun Dec 28 21:30:52 2014 +0100
@@ -32,6 +32,7 @@
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsmaster
   $ filterpath cvscall -Q -d "$CVSROOT" init
 
 checkout #1: add foo.txt