diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 57e663878..69f38113f 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -117,6 +117,7 @@ CPP_TEST_CASES += \
 	anonymous_bitfield \
 	apply_signed_char \
 	apply_strings \
+	argcargvtest \
 	argout \
 	array_member \
 	array_typedef_memberin \
diff --git a/Examples/test-suite/octave/argcargvtest_runme.m b/Examples/test-suite/octave/argcargvtest_runme.m
deleted file mode 100644
index f246dd9db..000000000
--- a/Examples/test-suite/octave/argcargvtest_runme.m
+++ /dev/null
@@ -1,29 +0,0 @@
-argcargvtest
-
-largs={'hi','hola','hello'};
-if (mainc(largs) != 3)
-  error("bad main typemap");
-endif
-
-targs={'hi','hola'};
-if (mainv(targs,1) != 'hola')
-  error("bad main typemap");
-endif
-
-targs={'hi', 'hola'};
-if (mainv(targs,1) != 'hola')
-  error("bad main typemap");
-endif
-
-try
-  error_flag = 0;
-  mainv('hello',1);
-  error_flag = 1;
-catch
-end_try_catch
-if (error_flag)
-  error("bad main typemap")
-endif
-
-
-initializeApp(largs);
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index c061f903a..ddcd4afe9 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -20,7 +20,6 @@ top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
 
 CPP_TEST_CASES += \
-	argcargvtest \
 	callback \
 	complextest \
 	director_stl \