diff --git a/db/mork/.cvsignore b/db/mork/.cvsignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/db/mork/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/db/mork/Makefile.in b/db/mork/Makefile.in
index ea64b55d664..0a9ceea9fa6 100644
--- a/db/mork/Makefile.in
+++ b/db/mork/Makefile.in
@@ -22,7 +22,11 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = src # tests public 
+DIRS = public src
+
+ifdef ENABLE_TESTS
+DIRS += tests
+endif
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/mailnews/db/mork/.cvsignore b/mailnews/db/mork/.cvsignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/mailnews/db/mork/Makefile.in b/mailnews/db/mork/Makefile.in
index ea64b55d664..0a9ceea9fa6 100644
--- a/mailnews/db/mork/Makefile.in
+++ b/mailnews/db/mork/Makefile.in
@@ -22,7 +22,11 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = src # tests public 
+DIRS = public src
+
+ifdef ENABLE_TESTS
+DIRS += tests
+endif
 
 include $(topsrcdir)/config/config.mk