diff --git a/Tests/TestDriver/CMakeLists.txt b/Tests/TestDriver/CMakeLists.txt
index 90f37e169..810c9ff58 100644
--- a/Tests/TestDriver/CMakeLists.txt
+++ b/Tests/TestDriver/CMakeLists.txt
@@ -4,10 +4,10 @@ SET(Extra_SRCS testExtraStuff.cxx testExtraStuff2.cxx )
 SET(Extra_SRCS ${Extra_SRCS};testExtraStuff3.cxx )
 INCLUDE_DIRECTORIES(${TestDriverTest_SOURCE_DIR})
 CREATE_TEST_SOURCELIST(testSrcs 
-                       TestDriverTest 
-                       test1 
-                       test2 
-	               subdir/test3 
+                       TestDriverTest.cxx 
+                       test1.cxx 
+                       test2.cxx 
+	               subdir/test3.cxx 
                        EXTRA_INCLUDE testArgs.h FUNCTION testProccessArgs)
 
 ADD_EXECUTABLE(TestDriverTest ${testSrcs} ${Extra_SRCS})
diff --git a/Tests/TestDriver/subdir/test3.cxx b/Tests/TestDriver/subdir/test3.cxx
index 13cfb5e0c..976d6ebaa 100644
--- a/Tests/TestDriver/subdir/test3.cxx
+++ b/Tests/TestDriver/subdir/test3.cxx
@@ -1,5 +1,5 @@
 #include <stdio.h>
-int subdir_test3(int ac, char** av)
+int subdir_test3(int ac, char*av[])
 {
   printf("test3\n");
   for(int i =0; i < ac; i++)
diff --git a/Tests/TestDriver/test1.cxx b/Tests/TestDriver/test1.cxx
index 1ee7e999d..ac82f8ae9 100644
--- a/Tests/TestDriver/test1.cxx
+++ b/Tests/TestDriver/test1.cxx
@@ -3,7 +3,7 @@ int testExtraStuff3();
 int testExtraStuff();
 int testExtraStuff2();
 
-int test1(int ac, char** av)
+int test1(int ac, char* av[])
 {
   if(!testExtraStuff2())
     {
diff --git a/Tests/TestDriver/test2.cxx b/Tests/TestDriver/test2.cxx
index 2c1f2af1b..69f0fff17 100644
--- a/Tests/TestDriver/test2.cxx
+++ b/Tests/TestDriver/test2.cxx
@@ -1,5 +1,5 @@
 #include <stdio.h>
-int test2(int ac, char** av)
+int test2(int ac, char*av[])
 {
   printf("test2\n");
   for(int i =0; i < ac; i++)