diff --git a/servers/vm/main.c b/servers/vm/main.c
index ed6802762..8b63b6fbb 100644
--- a/servers/vm/main.c
+++ b/servers/vm/main.c
@@ -322,6 +322,7 @@ void init_vm(void)
 	}
 
 	/* Turn file mmap on? */
+	enable_filemap=1;	/* yes by default */
 	env_parse("filemap", "d", 0, &enable_filemap, 0, 1);
 
 	/* Sanity check */
diff --git a/test/run b/test/run
index ec0b821b0..453126e08 100755
--- a/test/run
+++ b/test/run
@@ -29,7 +29,12 @@ alltests="   1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 \
 tests_no=`expr 0`
 
 # test mmap only if enabled in sysenv
+filemap=1	# the default is on
 if sysenv filemap >/dev/null
+then	filemap=`sysenv filemap`
+fi
+
+if [ "$filemap" -ne 0 ]
 then	alltests="$alltests 74"
 fi