diff --git a/testsuite/mkfs.minix.tests b/testsuite/mkfs.minix.tests
new file mode 100755
index 000000000..90df9316d
--- /dev/null
+++ b/testsuite/mkfs.minix.tests
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# mkfs.minix tests.
+# Copyright 2007 by Denys Vlasenko
+# Licensed under GPL v2, see file LICENSE for details.
+
+. testing.sh
+
+# testing "test name" "options" "expected result" "file input" "stdin"
+
+testing "mkfs.minix" \
+	"dd if=/dev/zero of=input bs=1k count=1024 2>/dev/null; mkfs.minix input; md5sum <input" \
+"352 inodes\n"\
+"1024 blocks\n"\
+"Firstdatazone=15 (15)\n"\
+"Zonesize=1024\n"\
+"Maxsize=268966912\n"\
+"4f35f7afeba07d56055bed1f29ae20b7  -\n" \
+	"" \
+	""
+
+exit $FAILCOUNT
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 35c0ccf5c..118b95efb 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -67,14 +67,13 @@
 
 #include "minix.h"
 
-#define DEBUG 0
-
-/* If debugging, store the very same times/uids/gids for image consistency */
-#if DEBUG
+/* Store the very same times/uids/gids for image consistency */
+#if 1
 # define CUR_TIME 0
 # define GETUID 0
 # define GETGID 0
 #else
+/* Was using this. Is it useful? NB: this will break testsuite */
 # define CUR_TIME time(NULL)
 # define GETUID getuid()
 # define GETGID getgid()