diff --git a/configure.ac b/configure.ac
index b4cbf2ef4..20349cd2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,6 +409,7 @@ schedutils/Makefile
 sys-utils/Makefile
 text-utils/Makefile
 tests/Makefile
+tests/helpers/Makefile
 tests/commands.sh
 ])
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 80d8b98d9..ff516ede4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/config/include-Makefile.am
 
+SUBDIRS = helpers
+
 EXTRA_DIST = 	commands.sh.in \
 		functions.sh \
 		ts-mount-paths \
diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 54d57a8a4..4345a28f5 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -1,6 +1,9 @@
 TOPDIR=@top_srcdir@
 TS_TOPDIR=$TOPDIR/tests
 
+# helpers
+TS_HELPER_SYSINFO="$TS_TOPDIR/helpers/mnt_test_sysinfo"
+
 # paths to commands
 TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$TOPDIR/mount/mount"}
 TS_CMD_UMOUNT=${TS_CMD_MOUNT:-"$TOPDIR/mount/umount"}
diff --git a/tests/helpers/Makefile.am b/tests/helpers/Makefile.am
new file mode 100644
index 000000000..13eaae1e9
--- /dev/null
+++ b/tests/helpers/Makefile.am
@@ -0,0 +1,5 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+noinst_PROGRAMS = mnt_test_sysinfo
+
+mnt_test_sysinfo_SOURCES = mnt_test_sysinfo.c 
diff --git a/tests/helpers/mnt_test_sysinfo.c b/tests/helpers/mnt_test_sysinfo.c
new file mode 100644
index 000000000..0acb130b0
--- /dev/null
+++ b/tests/helpers/mnt_test_sysinfo.c
@@ -0,0 +1,106 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <limits.h>
+
+typedef struct {
+	const char	*name;
+	int		(*fnc)(void);
+} mntHlpfnc;
+
+int
+hlp_wordsize(void)
+{
+	printf("%d\n", __WORDSIZE);
+	return 0;
+}
+
+int
+hlp_pagesize(void)
+{
+	printf("%d\n", getpagesize());
+	return 0;
+}
+
+int
+hlp_int_max(void)
+{
+	printf("%d\n", INT_MAX);
+	return 0;
+}
+
+int
+hlp_uint_max(void)
+{
+	printf("%u\n", UINT_MAX);
+	return 0;
+}
+
+int
+hlp_long_max(void)
+{
+	printf("%ld\n", LONG_MAX);
+	return 0;
+}
+
+int
+hlp_ulong_max(void)
+{
+	printf("%lu\n", ULONG_MAX);
+	return 0;
+}
+
+int
+hlp_ulong_max32(void)
+{
+	printf("%lu\n", ULONG_MAX >> 32);
+	return 0;
+}
+
+mntHlpfnc hlps[] = 
+{
+	{ "WORDSIZE",	hlp_wordsize	},
+	{ "pagesize",	hlp_pagesize	},
+	{ "INT_MAX",	hlp_int_max	},	
+	{ "UINT_MAX",   hlp_uint_max	},
+	{ "LONG_MAX",   hlp_long_max	},
+	{ "ULONG_MAX",  hlp_ulong_max	},
+	{ "ULONG_MAX32",hlp_ulong_max32	},
+	{ NULL, NULL }
+};
+
+int
+main(int argc, char **argv)
+{
+	int re = 0;
+	mntHlpfnc *fn;
+
+	if (argc == 1) {
+		for (fn = hlps; fn->name; fn++) {
+			printf("%15s: ", fn->name);
+			re += fn->fnc();
+		}
+	} else {
+		int i;
+
+		if (strcmp(argv[0], "--help") == 0 || strcmp(argv[0], "-h") == 0) {
+			printf("%s <option>\n", argv[0]);
+			fputs("options:\n", stdout);
+			for (fn = hlps; fn->name; fn++) 
+				printf("\t%s\n", fn->name);
+			exit(EXIT_SUCCESS);
+		}
+
+		for (i=1; i < argc; i++) {
+			for (fn = hlps; fn->name; fn++) {
+				if (strcmp(fn->name, argv[i]) == 0)
+					re += fn->fnc();
+			}
+		}
+	}
+	
+	exit(re ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+