diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index ed925e5..8d04c60 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -8,6 +8,7 @@
 
 EXTRA_DIST = \
 	$(noinst_SCRIPTS) \
+	args.stderr.exp args.stderr.exp.hd args.stdout.exp args.vgtest \
 	bitfield1.stderr.exp bitfield1.stderr.exp.hd bitfield1.vgtest \
 	bt_everything.stderr.exp bt_everything.stderr.exp.hd \
 	bt_everything.stdout.exp bt_everything.vgtest \
@@ -42,7 +43,7 @@
 	smc1.stderr.exp smc1.stderr.exp.hd smc1.stdout.exp smc1.vgtest
 
 noinst_PROGRAMS = \
-	bitfield1 bt_everything bt_literal coolo_strlen \
+	args bitfield1 bt_everything bt_literal coolo_strlen \
 	cpuid dastest discard floored fork fucomip munmap_exe rcl_assert \
 	rcrl readline1 resolv seg_override sha1_test shortpush shorts smc1 \
 	pth_blockedsig \
@@ -52,6 +53,7 @@
 CXXFLAGS = $(CFLAGS)
 
 # generic C ones
+args_SOURCES 		= args.c
 bitfield1_SOURCES 	= bitfield1.c
 bt_everything_SOURCES 	= bt_everything.c
 bt_literal_SOURCES 	= bt_literal.c
diff --git a/none/tests/args.c b/none/tests/args.c
new file mode 100644
index 0000000..e7307a0
--- /dev/null
+++ b/none/tests/args.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+int main(int argc, char* argv[])
+{
+   int i;
+
+   for (i = 0; i < argc; i++) {
+      printf("arg %d: `%s'\n", i, argv[i]);
+   }
+   return 0;
+}
diff --git a/none/tests/args.stderr.exp b/none/tests/args.stderr.exp
new file mode 100644
index 0000000..139597f
--- /dev/null
+++ b/none/tests/args.stderr.exp
@@ -0,0 +1,2 @@
+
+
diff --git a/none/tests/args.stderr.exp.hd b/none/tests/args.stderr.exp.hd
new file mode 100644
index 0000000..c4aa6f0
--- /dev/null
+++ b/none/tests/args.stderr.exp.hd
@@ -0,0 +1,7 @@
+
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+malloc/free: in use at exit: 0 bytes in 0 blocks.
+malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
+For a detailed leak analysis,  rerun with: --leak-check=yes
+For counts of detected errors, rerun with: -v
diff --git a/none/tests/args.stdout.exp b/none/tests/args.stdout.exp
new file mode 100644
index 0000000..0d9db35
--- /dev/null
+++ b/none/tests/args.stdout.exp
@@ -0,0 +1,4 @@
+arg 0: `./args'
+arg 1: `a'
+arg 2: `b'
+arg 3: `1 2 3'
diff --git a/none/tests/args.vgtest b/none/tests/args.vgtest
new file mode 100644
index 0000000..4b3529d
--- /dev/null
+++ b/none/tests/args.vgtest
@@ -0,0 +1,2 @@
+prog: args
+args: a b "1 2 3"