diff --git a/tests/Makefile.am b/tests/Makefile.am
index 69c7c4e0..7fbf6221 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -69,8 +69,6 @@ gem_ctx_basic_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
 gem_ctx_basic_LDADD = $(LDADD) -lpthread
 gem_ctx_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
 gem_ctx_thrash_LDADD = $(LDADD) -lpthread
-gem_concurrent_all_SOURCES = gem_concurrent.c
-gem_concurrent_blit_SOURCES = gem_concurrent.c
 gem_fence_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
 gem_fence_thrash_LDADD = $(LDADD) -lpthread
 gem_fence_upload_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
diff --git a/tests/gem_concurrent.c b/tests/gem_concurrent_all.c
similarity index 100%
rename from tests/gem_concurrent.c
rename to tests/gem_concurrent_all.c
diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c
new file mode 100644
index 00000000..513de4a1
--- /dev/null
+++ b/tests/gem_concurrent_blit.c
@@ -0,0 +1,8 @@
+/* This test is just a duplicate of gem_concurrent_all. */
+/* However the executeable will be gem_concurrent_blit. */
+/* The main function examines argv[0] and, in the case  */
+/* of gem_concurent_blit runs only a subset of the      */
+/* available subtests. This avoids the use of           */
+/* non-standard command line parameters which can cause */
+/* problems for automated testing */
+#include "gem_concurrent_all.c"