diff --git a/Accelerators/Piston/Testing/Cxx/CMakeLists.txt b/Accelerators/Piston/Testing/Cxx/CMakeLists.txt
index 88d12d59e50112d7d6db520b1064b84158192578..dde4a8e5620a9b1aff7f16a19cafbff3e470fd7d 100644
--- a/Accelerators/Piston/Testing/Cxx/CMakeLists.txt
+++ b/Accelerators/Piston/Testing/Cxx/CMakeLists.txt
@@ -1,29 +1,8 @@
-
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  TestUsePiston
-  EXTRA_INCLUDE vtkTestDriver.h
+vtk_add_test_cxx(AcceleratorsPiston
+  TestUsePiston.cxx
 )
 
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-string (REPLACE "vtk" "" _baselinedname ${vtk-module})
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/${_baselinedname}/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
 
 if(VTK_DATA_ROOT AND (VTK_MPI_MAX_NUMPROCS GREATER 1))
   find_package(MPI REQUIRED)
diff --git a/Charts/Core/Testing/Cxx/CMakeLists.txt b/Charts/Core/Testing/Cxx/CMakeLists.txt
index 6fccf5493b59ac7c5b9cd5fe8cf473032a8c0992..fe893773e4159325c76e9ea068e1967adb83c5fb 100644
--- a/Charts/Core/Testing/Cxx/CMakeLists.txt
+++ b/Charts/Core/Testing/Cxx/CMakeLists.txt
@@ -1,88 +1,50 @@
-# if we have rendering and views add the following tests
-  # add tests that do not require data
-  set(MyTests
-    TestContextScene.cxx
-    TestControlPointsItem.cxx
-    TestControlPointsItemEvents.cxx
-    )
-
-  if(VTK_DATA_ROOT)
-    # add tests that require data
-    set(MyTests ${MyTests}
-      TestAxes.cxx
-      TestBarGraph.cxx
-      TestBarGraphHorizontal.cxx
-      TestColorTransferFunction.cxx
-      TestChartMatrix.cxx
-      TestChartsOn3D.cxx
-      TestChartXYZ.cxx
-      TestContext.cxx
-      TestContextImage.cxx
-      TestControlPointsHandleItem.cxx
-      TestDiagram.cxx
-      TestHistogram2D.cxx
-      TestInteractiveChartXYZ.cxx
-      TestLegendHiddenPlots.cxx
-      TestLinePlot.cxx
-      TestLinePlot3D.cxx
-      TestLinePlotAxisFonts.cxx
-      TestLinePlot2.cxx
-      TestLinePlotInteraction.cxx
-      TestLinePlotSelection.cxx
-      TestLinePlotSelection2.cxx
-      TestMultipleChartRenderers.cxx
-      TestMultipleRenderers.cxx
-      TestMultipleScalarsToColors.cxx
-      TestParallelCoordinates.cxx
-      TestPieChart.cxx
-      TestPlotMatrix.cxx
-      TestScalarsToColors.cxx
-      TestScatterPlot.cxx
-      TestScatterPlotMatrix.cxx
-      TestScatterPlotMatrixVehicles.cxx
-      TestScatterPlotMatrixVisible.cxx
-      TestScientificPlot.cxx
-      TestStackedBarGraph.cxx
-      TestStackedPlot.cxx
-      TestSurfacePlot.cxx
-      )
-    # Set the tolerance higher for a few tests that need it
-    set(TestGLSLError 12)
-    set(TestChartsOn3DError 16)
-    set(TestLinePlotError 25)
-    set(TestLinePlot2Error 25)
-    set(TestLinePlotInteractionError 25)
-    set(TestMultipleRenderersError 25)
-    set(TestMultipleScalarsToColorsError 25)
-    set(TestParallelCoordinatesError 15)
-    set(TestControlPointsHandleItemError 30)
-    set(TestColorTransferFunctionError 80)
-  endif()
+# add tests that do not require data
+vtk_add_test_cxx(NO_DATA NO_VALID
+  TestContextScene.cxx
+  TestControlPointsItem.cxx
+  TestControlPointsItemEvents.cxx
+  )
 
-  # Use the testing object factory, to reduce boilerplate code in tests.
-  include(vtkTestingObjectFactory)
-  vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-  set(TestsToRun ${Tests})
-  list(REMOVE_ITEM TestsToRun CxxTests.cxx)
+if(VTK_DATA_ROOT)
+  # add tests that require data
+  vtk_add_test_cxx(Charts
+    TestAxes.cxx
+    TestBarGraph.cxx
+    TestBarGraphHorizontal.cxx
+    TestColorTransferFunction.cxx,-E80
+    TestChartMatrix.cxx
+    TestChartsOn3D.cxx,-E16
+    TestChartXYZ.cxx
+    TestContext.cxx
+    TestContextImage.cxx
+    TestControlPointsHandleItem.cxx,-E30
+    TestDiagram.cxx
+    TestHistogram2D.cxx
+    TestInteractiveChartXYZ.cxx
+    TestLegendHiddenPlots.cxx
+    TestLinePlot.cxx,-E25
+    TestLinePlot3D.cxx
+    TestLinePlotAxisFonts.cxx
+    TestLinePlot2.cxx,-E25
+    TestLinePlotInteraction.cxx,-E25
+    TestLinePlotSelection.cxx
+    TestLinePlotSelection2.cxx
+    TestMultipleChartRenderers.cxx
+    TestMultipleRenderers.cxx,-E25
+    TestMultipleScalarsToColors.cxx,-E25
+    TestParallelCoordinates.cxx,-E15
+    TestPieChart.cxx
+    TestPlotMatrix.cxx
+    TestScalarsToColors.cxx
+    TestScatterPlot.cxx
+    TestScatterPlotMatrix.cxx
+    TestScatterPlotMatrixVehicles.cxx
+    TestScatterPlotMatrixVisible.cxx
+    TestScientificPlot.cxx
+    TestStackedBarGraph.cxx
+    TestStackedPlot.cxx
+    TestSurfacePlot.cxx
+    )
+endif()
 
-  # Add all the executables
-  foreach(test ${TestsToRun})
-    get_filename_component(TName ${test} NAME_WE)
-    if(VTK_DATA_ROOT)
-      if(${${TName}Error})
-        set(_error_threshold ${${TName}Error})
-      else()
-        set(_error_threshold 10)
-      endif()
-      add_test(NAME ${vtk-module}Cxx-${TName}
-        COMMAND ${vtk-module}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_TEST_OUTPUT_DIR}
-          -V Baseline/Charts/${TName}.png
-          -E ${_error_threshold})
-    else()
-      add_test(NAME ${vtk-module}Cxx-${TName}
-        COMMAND ${vtk-module}CxxTests ${TName})
-    endif()
-  endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Common/Color/Testing/Cxx/CMakeLists.txt b/Common/Color/Testing/Cxx/CMakeLists.txt
index 269c212e68ebe76206ef2138ff3aebae00d7d49a..88df3c9c7d68aadfdd3a8c78b5a13d7bd46bc502 100644
--- a/Common/Color/Testing/Cxx/CMakeLists.txt
+++ b/Common/Color/Testing/Cxx/CMakeLists.txt
@@ -1,36 +1,12 @@
-set(CommonColorTests
+vtk_add_test_cxx(Common
   TestCategoricalColors.cxx
   TestNamedColors.cxx
-)
+  )
 
 if (VTK_DATA_ROOT)
-  set(CommonColorTestsWithArgs
+  vtk_add_test_cxx(Common
     TestColorSeries.cxx
-  )
+    )
 endif()
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${CommonColorTests}
-  ${CommonColorTestsWithArgs}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach (test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if (VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_TEST_OUTPUT_DIR}
-          -V Baseline/Common/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Common/Core/Testing/Cxx/CMakeLists.txt b/Common/Core/Testing/Cxx/CMakeLists.txt
index e6be4a78e23300ac5efb8c5cb53d3fb4cd004f23..b6f0c4c471e61bac6e7dd3ec33095632bd669982 100644
--- a/Common/Core/Testing/Cxx/CMakeLists.txt
+++ b/Common/Core/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,10 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+# Tell TestSystemInformation where to find the build trees.
+set(TestSystemInformation_ARGS ${CMAKE_BINARY_DIR})
+
+# Tell TestXMLFileOutputWindow where to write test file
+set(TestXMLFileOutputWindow_ARGS ${CMAKE_BINARY_DIR}/Testing/Temporary/XMLFileOutputWindow.txt)
+
+vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
   TestArrayAPI.cxx
   TestArrayAPIConvenience.cxx
   TestArrayAPIDense.cxx
@@ -46,24 +52,7 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   #otherLookupTable.cxx
   #otherLookupTableWithEnabling.cxx
   otherStringArray.cxx
+  )
 
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests}
+vtk_test_cxx_executable(${vtk-module}CxxTests
   vtkTestNewVar.cxx)
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Tell TestSystemInformation where to find the build trees.
-set(TestSystemInformation_ARGS ${CMAKE_BINARY_DIR})
-
-# Tell TestXMLFileOutputWindow where to write test file
-set(TestXMLFileOutputWindow_ARGS ${CMAKE_BINARY_DIR}/Testing/Temporary/XMLFileOutputWindow.txt)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  add_test(NAME ${vtk-module}-${TName} COMMAND ${vtk-module}CxxTests ${TName} ${${TName}_ARGS})
-endforeach()
diff --git a/Common/DataModel/Testing/Cxx/CMakeLists.txt b/Common/DataModel/Testing/Cxx/CMakeLists.txt
index 0b366d932d7a42645faa9a8a657dea6757482388..0902ba5beab7e98f8e5b8ae31fcea70ed29ecf3b 100644
--- a/Common/DataModel/Testing/Cxx/CMakeLists.txt
+++ b/Common/DataModel/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
   TestColor.cxx
   TestVector.cxx
   TestVectorOperators.cxx
@@ -40,17 +40,5 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   TestPlane.cxx
   TestStructuredData.cxx
   TestDataObjectTypes.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach (test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName})
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Common/ExecutionModel/Testing/Cxx/CMakeLists.txt b/Common/ExecutionModel/Testing/Cxx/CMakeLists.txt
index 754b87f266b6fcb43c0b0011fa80d720c386cc9c..6f7eb6a8a4d9514114e555273e381ba3485eb9c0 100644
--- a/Common/ExecutionModel/Testing/Cxx/CMakeLists.txt
+++ b/Common/ExecutionModel/Testing/Cxx/CMakeLists.txt
@@ -1,30 +1,7 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(NO_DATA NO_VALID
   TestCopyAttributeData.cxx
   TestImageDataToStructuredGrid.cxx
   TestSetInputDataObject.cxx
   TestTemporalSupport.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach (test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-
-  if(VTK_DATA_ROOT)
-  add_test(NAME ${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-      -D ${VTK_DATA_ROOT}
-      -T ${VTK_TEST_OUTPUT_DIR}
-      -V Baseline/${vtk-module}/${TName}.png)
-  else()
-  add_test(NAME ${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-      -T ${VTK_TEST_OUTPUT_DIR}
-      )
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Common/Math/Testing/Cxx/CMakeLists.txt b/Common/Math/Testing/Cxx/CMakeLists.txt
index 501d988af49883f272b707e2b04e3db971b8b6cc..98a9ca05f483781334edf6feb7bd4c46eb99e589 100644
--- a/Common/Math/Testing/Cxx/CMakeLists.txt
+++ b/Common/Math/Testing/Cxx/CMakeLists.txt
@@ -1,28 +1,14 @@
-set(Test_SRCS
+vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
   TestAmoebaMinimizer.cxx
   TestMatrix3x3.cxx
   TestPolynomialSolversUnivariate.cxx
   TestQuaternion.cxx
-)
+  )
 
 if(NOT VTK_LEGACY_REMOVE)
-  list(APPEND Test_SRCS
+  vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
     TestFastNumericConversion.cxx
     )
 endif()
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${Test_SRCS}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach (test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Common/Misc/Testing/Cxx/CMakeLists.txt b/Common/Misc/Testing/Cxx/CMakeLists.txt
index 227fe6b6b5e249ad07ca91c679558430b5b33b03..0a56e3f4eb36dcc1677a41a4cca190b9ec0349d2 100644
--- a/Common/Misc/Testing/Cxx/CMakeLists.txt
+++ b/Common/Misc/Testing/Cxx/CMakeLists.txt
@@ -1,16 +1,2 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  TestPolygonBuilder.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach (test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName})
-endforeach()
+vtk_add_test_cxx(TestPolygonBuilder.cxx NO_DATA NO_VALID NO_OUTPUT)
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Common/System/Testing/Cxx/CMakeLists.txt b/Common/System/Testing/Cxx/CMakeLists.txt
index 025f974073f4d4e6ae0443bab0c1633f7eed0331..c53d2ef7a6a3236069bb0efb8f7681fe8b6ff553 100644
--- a/Common/System/Testing/Cxx/CMakeLists.txt
+++ b/Common/System/Testing/Cxx/CMakeLists.txt
@@ -1,16 +1,5 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
   TestDirectory.cxx
   otherTimerLog.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach (test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  add_test(NAME ${TName} COMMAND ${vtk-module}CxxTests ${TName})
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Domains/Chemistry/Testing/Cxx/CMakeLists.txt b/Domains/Chemistry/Testing/Cxx/CMakeLists.txt
index 67f59b4bde68f721f91a7b69700eef9ea845439a..626171fbcaf1369236b4f99c80a5c30d7951b1d7 100644
--- a/Domains/Chemistry/Testing/Cxx/CMakeLists.txt
+++ b/Domains/Chemistry/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MyTests
+vtk_add_test_cxx(Chemistry
   TestBallAndStick.cxx
   TestPDBBallAndStick.cxx
   TestBondColorModeDiscreteByAtom.cxx
@@ -20,36 +20,7 @@ set(MyTests
 
 # Tests with data
 if(VTK_DATA_ROOT)
-  set(MyTests
-    ${MyTests}
-    TestCMLMoleculeReader.cxx
-    )
+  vtk_add_test_cxx(TestCMLMoleculeReader.cxx Chemistry)
 endif()
 
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    if(${${TName}Error})
-      set(_error_threshold ${${TName}Error})
-    else()
-      set(_error_threshold 10)
-    endif()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Chemistry/${TName}.png
-        -E ${_error_threshold})
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach ()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Filters/AMR/Testing/Cxx/CMakeLists.txt b/Filters/AMR/Testing/Cxx/CMakeLists.txt
index ad1ddb70983461fba5bad64d9c5d250290ea0757..b9b8c0838114ea6b371e65f3c9c8fcae9fa9260a 100644
--- a/Filters/AMR/Testing/Cxx/CMakeLists.txt
+++ b/Filters/AMR/Testing/Cxx/CMakeLists.txt
@@ -1,25 +1,11 @@
-## List all test sources
-set(MyTests
-    TestAMRGhostLayerStripping.cxx
-    TestAMRBlanking.cxx
-    TestAMRIterator.cxx
-    TestImageToAMR.cxx
-    )
-
-## Create test source list
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-    ${MyTests}
-    EXTRA_INCLUDE vtkTestDriver.h
-    )
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-## Add all executables
-foreach(test ${TestsToRun})
-  get_filename_component(t ${test} NAME_WE)
-  add_test(NAME ${vtk-module}Cxx-${t}
-    COMMAND ${vtk-module}CxxTests ${t} -D ${VTK_DATA_ROOT})
-  set_tests_properties(${vtk-module}Cxx-${t} PROPERTIES FAIL_REGULAR_EXPRESSION "Error")
+set(tests
+  TestAMRGhostLayerStripping
+  TestAMRBlanking
+  TestAMRIterator
+  TestImageToAMR
+  )
+foreach(t ${tests})
+  vtk_add_test_cxx(${t}.cxx NO_VALID NO_OUTPUT)
+  set_property(TEST ${vtk-module}Cxx-${t} PROPERTY FAIL_REGULAR_EXPRESSION "Error")
 endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Filters/Core/Testing/Cxx/CMakeLists.txt b/Filters/Core/Testing/Cxx/CMakeLists.txt
index a296ff25dc86217496a9e602b7ad2d930b1af176..562c37682e10bd64274199a5257a369c200c09e9 100644
--- a/Filters/Core/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Core/Testing/Cxx/CMakeLists.txt
@@ -1,12 +1,11 @@
 # Tests with data
 if(VTK_DATA_ROOT)
-  set(NEEDS_DATA
-    TestArrayCalculator
+  vtk_add_test_cxx(Graphics
+    TestArrayCalculator.cxx
     )
 endif()
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${NEEDS_DATA}
+vtk_add_test_cxx(Graphics
   TestGhostArray.cxx
   # TestAppendPolyData.cxx
   TestAppendSelection.cxx
@@ -20,25 +19,5 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   TestImplicitPolyDataDistance.cxx
   TestCutter.cxx
   TestThreshold.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
\ No newline at end of file
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Filters/Extraction/Testing/Cxx/CMakeLists.txt b/Filters/Extraction/Testing/Cxx/CMakeLists.txt
index c84904acda9aad8cfe227b89a5dd3dcf82b9e5ee..ac8ad93abaa95ca04ba731dfe32631fc8f8506a8 100644
--- a/Filters/Extraction/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Extraction/Testing/Cxx/CMakeLists.txt
@@ -1,26 +1,6 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Graphics
   TestConvertSelection.cxx
   TestExtractSelection.cxx
   TestExtraction.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt b/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt
index 064f4d99640c977b8e900d71111dd06111a4c1d6..ec79f12e702d7e68619bf211a03602c453d96a6a 100644
--- a/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt
+++ b/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt
@@ -1,30 +1,7 @@
-set(MyTests
+vtk_add_test_cxx(Graphics
   TestBSPTree.cxx
-  TestStreamTracer
-  TestAMRInterpolatedVelocityField
-  TestParticleTracers
+  TestStreamTracer.cxx
+  TestAMRInterpolatedVelocityField.cxx
+  TestParticleTracers.cxx
   )
-
-include(vtkTestingObjectFactory)
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach (test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-
-  if(VTK_DATA_ROOT)
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png)
-  else()
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-      -T ${VTK_TEST_OUTPUT_DIR}
-      )
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Filters/General/Testing/Cxx/CMakeLists.txt b/Filters/General/Testing/Cxx/CMakeLists.txt
index 0243de9cdb6435453752dc043cdbeb7f01d11319..bf13dedbf1142ab7776a4bdd32387696864472ae 100644
--- a/Filters/General/Testing/Cxx/CMakeLists.txt
+++ b/Filters/General/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MyTests
+vtk_add_test_cxx(Graphics
   TestGraphWeightEuclideanDistanceFilter.cxx
   BoxClipPolyData.cxx
   BoxClipTetrahedra.cxx
@@ -10,7 +10,7 @@ set(MyTests
   TestContourTriangulatorCutter.cxx
   TestContourTriangulatorMarching.cxx
   TestDeformPointSet.cxx
-  TestDensifyPolyData.cxx
+  TestDensifyPolyData.cxx,-E15
   TestDistancePolyDataFilter.cxx
   TestImageDataToPointSet.cxx
   TestIntersectionPolyDataFilter.cxx
@@ -18,11 +18,11 @@ set(MyTests
   TestRectilinearGridToPointSet.cxx
   TestReflectionFilter.cxx
   TestUncertaintyTubeFilter.cxx
-)
+  )
+
 # Tests with data
 if(VTK_DATA_ROOT)
-  set(MyTests
-    ${MyTests}
+  vtk_add_test_cxx(Graphics
     TestGradientAndVorticity.cxx
     TestIconGlyphFilterGravity.cxx
     TestQuadraturePoints.cxx
@@ -30,34 +30,4 @@ if(VTK_DATA_ROOT)
     )
 endif()
 
-# Set the tolerance higher for a few tests that need it
-set(TestDensifyPolyDataError 15)
-
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    if(${${TName}Error})
-      set(_error_threshold ${${TName}Error})
-    else()
-      set(_error_threshold 10)
-    endif()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png
-        -E ${_error_threshold})
- else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
- endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Filters/Geometry/Testing/Cxx/CMakeLists.txt b/Filters/Geometry/Testing/Cxx/CMakeLists.txt
index abba4871e7ac42c13dc0af51c2fbec6f7b61bbfd..cc46dac495f66c97fced13612447150804e92e63 100644
--- a/Filters/Geometry/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Geometry/Testing/Cxx/CMakeLists.txt
@@ -1,33 +1,12 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Graphics
   TestExtractSurfaceNonLinearSubdivision.cxx
   TestImageDataToUniformGrid.cxx
   TestProjectSphereFilter.cxx
   TestStructuredAMRNeighbor.cxx
   TestUniformGridGhostDataGenerator.cxx
   TestUnstructuredGridGeometryFilter.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
 
 ## list of tests that are not included in the main driver
 set(MyTests
diff --git a/Filters/Hybrid/Testing/Cxx/CMakeLists.txt b/Filters/Hybrid/Testing/Cxx/CMakeLists.txt
index f2e03ad7c9a6f5665df14e8b8bc6479610a0bef4..cc119888c9628860e40e9f5e3b82bb09d75d95a4 100644
--- a/Filters/Hybrid/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Hybrid/Testing/Cxx/CMakeLists.txt
@@ -1,54 +1,13 @@
-Set(MyTests
+vtk_add_test_cxx(Hybrid
   # TestBSplineWarp.cxx           # Fixme after vtkImageViewer deps
   TestPolyDataSilhouette.cxx
   TestTemporalCacheSimple.cxx
   TestTemporalCacheTemporal.cxx
+  )
+vtk_add_test_cxx(Parallel
   TestTemporalFractal.cxx
+  )
+vtk_add_test_cxx(Graphics
   TemporalStatistics.cxx
-)
-
-include(vtkTestingObjectFactory)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# eventually we want to move this in the loop, but we need this
-# special case because the base line image is in Baseline/Parallel
-set(temporalfractal-test TestTemporalFractal.cxx)
-set(temporalstat-test TemporalStatistics.cxx)
-
-if(VTK_DATA_ROOT)
-  get_filename_component(TName ${temporalfractal-test} NAME_WE)
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-    -D ${VTK_DATA_ROOT}
-    -T ${VTK_TEST_OUTPUT_DIR}
-    -V Baseline/Parallel/${TName}.png)
-
-  get_filename_component(TName ${temporalstat-test} NAME_WE)
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-    -D ${VTK_DATA_ROOT}
-    -T ${VTK_TEST_OUTPUT_DIR}
-    -V Baseline/Graphics/${TName}.png)
-endif()
-list(REMOVE_ITEM TestsToRun ${temporalfractal-test})
-list(REMOVE_ITEM TestsToRun ${temporalstat-test})
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Hybrid/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Filters/HyperTree/Testing/Cxx/CMakeLists.txt b/Filters/HyperTree/Testing/Cxx/CMakeLists.txt
index ce311f1aaeee53b07a2b9809bd1fe8e828e378d8..4c5d958929a79628e512f735a05fed3fdb42beb1 100644
--- a/Filters/HyperTree/Testing/Cxx/CMakeLists.txt
+++ b/Filters/HyperTree/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Graphics
   TestClipHyperOctree.cxx
   TestHyperOctreeContourFilter.cxx
   TestHyperOctreeCutter.cxx
@@ -30,26 +30,5 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   TestHyperTreeGridTernary3DUnstructuredMaterial.cxx
   TestHyperTreeGridTernaryHyperbola.cxx
   TestHyperTreeGridTernarySphereMaterial.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    string(REGEX REPLACE "Bits" "" TNameNoBits ${TName})
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TNameNoBits}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Filters/Modeling/Testing/Cxx/CMakeLists.txt b/Filters/Modeling/Testing/Cxx/CMakeLists.txt
index 6fdb963d338d824fe68712020b9e0271428bf0f6..68fd9e793c7925c623d426cd4ca7c21b68466e7a 100644
--- a/Filters/Modeling/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Modeling/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Graphics
   TestButterflyScalars.cxx
   TestNamedColorsIntegration.cxx
   TestPolyDataPointSampler.cxx
@@ -6,26 +6,5 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   TestQuadRotationalExtrusionMultiBlock.cxx
   TestRotationalExtrusion.cxx
   TestSelectEnclosedPoints.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Filters/Programmable/Testing/Cxx/CMakeLists.txt b/Filters/Programmable/Testing/Cxx/CMakeLists.txt
index 556da1a57443e0b749af9f7d21d5dc5878d42563..830aa81555a49d4567bcd1ae4b5256755b6d223e 100644
--- a/Filters/Programmable/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Programmable/Testing/Cxx/CMakeLists.txt
@@ -1,25 +1,4 @@
-set(MyTests
+vtk_add_test_cxx(Graphics
   TestProgrammableGlyph.cxx
-)
-
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${MyTests})
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Filters/Selection/Testing/Cxx/CMakeLists.txt b/Filters/Selection/Testing/Cxx/CMakeLists.txt
index 7b1c68b0d7346b9e43121460f1c4cd061ec6ae8e..64fc48740b02020c6ce3a1f5c9bf9ea8d89daf11 100644
--- a/Filters/Selection/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Selection/Testing/Cxx/CMakeLists.txt
@@ -1,39 +1,14 @@
-set(MyTests
+vtk_add_test_cxx(Graphics
   TestLinearSelector2D.cxx
-)
+  )
 
 # Tests with data
 if(VTK_DATA_ROOT)
-  set(MyTests
-    ${MyTests}
+  vtk_add_test_cxx(Graphics
     TestCellDistanceSelector2D.cxx
     TestCellDistanceSelector3D.cxx
     TestLinearSelector3D.cxx
     )
 endif()
 
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach (test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-
-  if(VTK_DATA_ROOT)
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png)
-  else()
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-      -T ${VTK_TEST_OUTPUT_DIR}
-      )
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Filters/Sources/Testing/Cxx/CMakeLists.txt b/Filters/Sources/Testing/Cxx/CMakeLists.txt
index d028726d5754538c6bba14e3b4e253fcd281d5aa..9655eff98b1bc4459259724d52d9ef7d18c8086e 100644
--- a/Filters/Sources/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Sources/Testing/Cxx/CMakeLists.txt
@@ -1,27 +1,6 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Graphics
   TestLineSource.cxx
   TestTessellatedBoxSource.cxx
   TestMultiBlock.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Graphics/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Filters/Statistics/Testing/Cxx/CMakeLists.txt b/Filters/Statistics/Testing/Cxx/CMakeLists.txt
index 8d6d26c9a22585becbb48a9a8370b11685795f27..c32619b710421a0c6d86fe70350c3eddde35a4a0 100644
--- a/Filters/Statistics/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Statistics/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
   TestAutoCorrelativeStatistics.cxx
   TestCorrelativeStatistics.cxx
   TestContingencyStatistics.cxx
@@ -7,17 +7,5 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   TestMultiCorrelativeStatistics.cxx
   TestOrderStatistics.cxx
   TestPCAStatistics.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Filters/Verdict/Testing/Cxx/CMakeLists.txt b/Filters/Verdict/Testing/Cxx/CMakeLists.txt
index 8ffb8a4d207bf2b0588380f37a5b7e2972a565c3..0f9108d3b85b3149e3bedae2740b5227545826c5 100644
--- a/Filters/Verdict/Testing/Cxx/CMakeLists.txt
+++ b/Filters/Verdict/Testing/Cxx/CMakeLists.txt
@@ -1,23 +1,2 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  MeshQuality.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-            COMMAND ${vtk-module}CxxTests ${TName}
-                                          -D ${VTK_DATA_ROOT}
-                                          -T ${VTK_TEST_OUTPUT_DIR}
-                                          -V Baseline/${vtk-module}/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_add_test_cxx(MeshQuality.cxx NO_VALID)
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/GUISupport/Qt/Testing/Cxx/CMakeLists.txt b/GUISupport/Qt/Testing/Cxx/CMakeLists.txt
index eb390bbe943ee012ceda3412782604c2bc855d84..0d32ce89de80ba6e8de0fb466ff1c97e3c2d648b 100644
--- a/GUISupport/Qt/Testing/Cxx/CMakeLists.txt
+++ b/GUISupport/Qt/Testing/Cxx/CMakeLists.txt
@@ -1,31 +1,10 @@
-set(MyTests
+vtk_add_test_cxx(QVTK
   TestQtDebugLeaksView.cxx
   TestQtTableModelAdapter.cxx
   TestQtTreeModelAdapter.cxx
   )
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx ${MyTests}
-  EXTRA_INCLUDE vtkTestDriver.h)
-
 find_package(Qt4 REQUIRED)
 include(${QT_USE_FILE})
 
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests} QTestApp.cxx)
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/QVTK/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests QTestApp.cxx)
diff --git a/Geovis/Core/Testing/Cxx/CMakeLists.txt b/Geovis/Core/Testing/Cxx/CMakeLists.txt
index ad68beae20594645d4eb8889d80292ca21946e67..368128ff0e960d73ab2a1a758b91e24524ce59d8 100644
--- a/Geovis/Core/Testing/Cxx/CMakeLists.txt
+++ b/Geovis/Core/Testing/Cxx/CMakeLists.txt
@@ -1,27 +1,10 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Geovis
   TestCoincidentGeoGraphRepresentation2D.cxx
   TestGeoAssignCoordinates.cxx
   TestGeoGraticule.cxx
   TestGeoProjection.cxx
   TestGlobeSource.cxx
   TestLabeledGeoView2D.cxx
-)
+  )
 
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-            COMMAND ${vtk-module}CxxTests ${TName}
-                                          -D ${VTK_DATA_ROOT}
-                                          -T ${VTK_TEST_OUTPUT_DIR}
-                                          -V Baseline/Geovis/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/AMR/Testing/Cxx/CMakeLists.txt b/IO/AMR/Testing/Cxx/CMakeLists.txt
index 729907d966c4f0a80bdf5d00e7b660cf494fc969..27355cd61c45477afdfc855024056f1bce2f9c7c 100644
--- a/IO/AMR/Testing/Cxx/CMakeLists.txt
+++ b/IO/AMR/Testing/Cxx/CMakeLists.txt
@@ -1,24 +1,7 @@
-## List all test sources
-set(MyTests
-#    TestFlashReader.cxx  there is not data for this test
+if(VTK_DATA_ROOT)
+  vtk_add_test_cxx(NO_VALID NO_OUTPUT
+    #    TestFlashReader.cxx  there is not data for this test
     TestEnzoReader.cxx
     )
-
-## Create test source list
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-    ${MyTests}
-    EXTRA_INCLUDE vtkTestDriver.h
-    )
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-## Add all executables
-if (VTK_DATA_ROOT)
- foreach(test ${TestsToRun})
-   get_filename_component(t ${test} NAME_WE)
-   add_test(NAME ${vtk-module}Cxx-${t}
-     COMMAND ${vtk-module}CxxTests ${t} -D ${VTK_DATA_ROOT})
- endforeach()
+  vtk_test_cxx_executable(${vtk-module}CxxTests)
 endif()
diff --git a/IO/Core/Testing/Cxx/CMakeLists.txt b/IO/Core/Testing/Cxx/CMakeLists.txt
index cd35333b825f5b18b8c113db209255103eb14142..d14822901904b57e916b9a1aeaf114119e27b3e3 100644
--- a/IO/Core/Testing/Cxx/CMakeLists.txt
+++ b/IO/Core/Testing/Cxx/CMakeLists.txt
@@ -1,27 +1,7 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(IO
   TestArrayDataWriter.cxx
   TestArrayDenormalized.cxx
   TestArraySerialization.cxx
   TestCompress.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-            COMMAND ${vtk-module}CxxTests ${TName}
-                                          -D ${VTK_DATA_ROOT}
-                                          -T ${VTK_TEST_OUTPUT_DIR}
-                                          -V Baseline/${vtk-module}/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/Exodus/Testing/Cxx/CMakeLists.txt b/IO/Exodus/Testing/Cxx/CMakeLists.txt
index a68a967cace26b0d00be100ced16c130ab0025eb..5503e170bbcad818b7bee8224aaa9363122e4126 100644
--- a/IO/Exodus/Testing/Cxx/CMakeLists.txt
+++ b/IO/Exodus/Testing/Cxx/CMakeLists.txt
@@ -1,29 +1,12 @@
-# VS6 builds do not handle out-of-range double assignment to float
-# properly. Do not run TestMultiBlockExodusWrite on VS6 builds.
-#
-if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 6")
-  set(MyTests ${MyTests}
-    TestMultiBlockExodusWrite.cxx
-    )
-endif()
-
-
 # Tests with data
 if(VTK_DATA_ROOT)
-  # Use the testing object factory, to reduce boilerplate code in tests.
-  include(vtkTestingObjectFactory)
-  vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-  set(TestsToRun ${Tests})
-  list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-  # Add all the executables
-  foreach(test ${TestsToRun})
-    get_filename_component(TName ${test} NAME_WE)
-      add_test(NAME ${vtk-module}-${TName}
-        COMMAND ${vtk-module}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_TEST_OUTPUT_DIR}
-          -V Baseline/Parallel/${TName}.png)
-  endforeach ()
+  # VS6 builds do not handle out-of-range double assignment to float
+  # properly. Do not run TestMultiBlockExodusWrite on VS6 builds.
+  #
+  if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 6")
+    vtk_add_test_cxx(Parallel
+      TestMultiBlockExodusWrite.cxx
+      )
+  endif()
+  vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
 endif()
diff --git a/IO/Export/Testing/Cxx/CMakeLists.txt b/IO/Export/Testing/Cxx/CMakeLists.txt
index 63bf1f5e449ade372c212962a7aaefa78f5bfb2c..bf7dad7c24ba1f84c65885f62748746fe156d184 100644
--- a/IO/Export/Testing/Cxx/CMakeLists.txt
+++ b/IO/Export/Testing/Cxx/CMakeLists.txt
@@ -12,38 +12,9 @@ if(VTK_GHOSTSCRIPT_EXECUTABLE AND VTK_DATA_ROOT)
   )
 endif()
 
-set(MyTests
-  X3DTest.cxx
-)
-
-if (VTK_DATA_ROOT)
-  set(MyTests
-    ${MyTest}
-    ${GL2PSTests}
-  )
-endif()
-
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Hybrid/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_add_test_cxx(X3DTest.cxx NO_DATA NO_VALID)
+vtk_add_test_cxx(${GL2PSTests} Hybrid)
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
 
 # The GL2PS tests produce postscript output, which cannot be compared using
 # the built-in image regression framework. The tests added above will create the
@@ -53,6 +24,7 @@ endforeach()
 if(GL2PSTests)
   set(TestGL2PSExporterVolumeRasterError 50)
   foreach(test ${GL2PSTests})
+    get_filename_component(TName ${test} NAME_WE)
     add_test(NAME ${vtk-module}Cxx-${TName}-RasterizePNG
       COMMAND ${CMAKE_COMMAND}
         -DPSFILE=${VTK_TEST_OUTPUT_DIR}/${TName}.ps
diff --git a/IO/FFMPEG/Testing/Cxx/CMakeLists.txt b/IO/FFMPEG/Testing/Cxx/CMakeLists.txt
index 3b6a0d2095d98e5ba072024d6314189807ec48db..e22c0f52415ee3267f1e0af0b52a7a9a41b7c66b 100644
--- a/IO/FFMPEG/Testing/Cxx/CMakeLists.txt
+++ b/IO/FFMPEG/Testing/Cxx/CMakeLists.txt
@@ -1,26 +1,4 @@
-set(TEST_SRC)
-
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-   TestFFMPEGWriter.cxx
-  ${TEST_SRC}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_add_test_cxx(IO
+  TestFFMPEGWriter.cxx
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/GDAL/Testing/Cxx/CMakeLists.txt b/IO/GDAL/Testing/Cxx/CMakeLists.txt
index 7e86efc008d95e8d5f545576a71135a8b343c1cd..cff940064b651b738a6e94e1d5afd3cd15ac5eb6 100644
--- a/IO/GDAL/Testing/Cxx/CMakeLists.txt
+++ b/IO/GDAL/Testing/Cxx/CMakeLists.txt
@@ -1,25 +1,4 @@
-create_test_sourcelist(Tests
-  ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(IO
   TestGDALVectorReader.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/Geometry/Testing/Cxx/CMakeLists.txt b/IO/Geometry/Testing/Cxx/CMakeLists.txt
index d20b93f459fe72d4a4bc46808076b5ab7e7638c7..01c9f6ff7efa189f0f2efceb8f3b39253bb72944 100644
--- a/IO/Geometry/Testing/Cxx/CMakeLists.txt
+++ b/IO/Geometry/Testing/Cxx/CMakeLists.txt
@@ -1,38 +1,15 @@
 # Tests with data
 if(VTK_DATA_ROOT)
-  set(NEEDS_DATA
-  TestProStarReader.cxx
-  TestTecplotReader.cxx
-  TestAMRReadWrite.cxx
-  )
+  vtk_add_test_cxx(IO
+    TestProStarReader.cxx
+    TestTecplotReader.cxx
+    TestAMRReadWrite.cxx
+    )
 endif()
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${NEEDS_DATA}
+vtk_add_test_cxx(IO
   TestSimplePointsReaderWriter.cxx
-  TestWindBladeReader.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx TestWindBladeReader.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
 
 set(_known_little_endian FALSE)
 if (DEFINED CMAKE_WORDS_BIGENDIAN)
@@ -40,11 +17,10 @@ if (DEFINED CMAKE_WORDS_BIGENDIAN)
     set(_known_little_endian TRUE)
   endif()
 endif()
-
 if(VTK_LARGE_DATA_ROOT AND _known_little_endian)
-  add_test(NAME ${vtk-module}Cxx-TestWindBladeReader
-    COMMAND ${vtk-module}CxxTests TestWindBladeReader
-    -D ${VTK_LARGE_DATA_ROOT}
-    -T ${VTK_TEST_OUTPUT_DIR}
-    -V Baseline/Parallel/TestWindBladeReader.png)
+  vtk_add_test_cxx(Parallel LARGE_DATA
+    TestWindBladeReader.cxx
+    )
 endif()
+
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/Image/Testing/Cxx/CMakeLists.txt b/IO/Image/Testing/Cxx/CMakeLists.txt
index ad6be0f955f0ea99a741be87bf4b1b52fb4172fe..bdfcce0b8710b18112aff5b3d930f9d5f01ca0c1 100644
--- a/IO/Image/Testing/Cxx/CMakeLists.txt
+++ b/IO/Image/Testing/Cxx/CMakeLists.txt
@@ -1,40 +1,11 @@
-set(TEST_SRC)
-
 if (VTK_DATA_ROOT)
-  set(TEST_SRC
+  vtk_add_test_cxx(IO
+    # TestImageReader2Factory.cxx   # fixme (deps not satisfied)
     TestNrrdReader.cxx
     )
-endif()
-
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  # TestImageReader2Factory.cxx   # fixme (deps not satisfied)
-  TestMetaIO.cxx
-  ${TEST_SRC}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-list(REMOVE_ITEM TestsToRun TestMetaIO.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
-
-if(VTK_DATA_ROOT)
-  add_test(NAME ${vtk-module}Cxx-MetaIO
-    COMMAND ${vtk-module}CxxTests TestMetaIO
-      ${VTK_DATA_ROOT}/Data/HeadMRVolume.mhd)
+  set(TestMetaIO_ARGS ${VTK_DATA_ROOT}/Data/HeadMRVolume.mhd)
+  vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
+    TestMetaIO.cxx
+    )
+  vtk_test_cxx_executable(${vtk-module}CxxTests)
 endif()
diff --git a/IO/Import/Testing/Cxx/CMakeLists.txt b/IO/Import/Testing/Cxx/CMakeLists.txt
index f4933fae215745d1bda998d8892a3794c5d00039..7dda04b517a8a787d1dfd8f46d24ee14b2df547e 100644
--- a/IO/Import/Testing/Cxx/CMakeLists.txt
+++ b/IO/Import/Testing/Cxx/CMakeLists.txt
@@ -1,29 +1,6 @@
 if(VTK_DATA_ROOT)
-  set (NEEDS_DATA
-  TestVRMLNormals.cxx
-  )
+  vtk_add_test_cxx(Hybrid
+    TestVRMLNormals.cxx
+    )
+  vtk_test_cxx_executable(${vtk-module}CxxTests)
 endif()
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${NEEDS_DATA}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Hybrid/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
diff --git a/IO/Infovis/Testing/Cxx/CMakeLists.txt b/IO/Infovis/Testing/Cxx/CMakeLists.txt
index f7559f8e7b96041a803f3fdfb5c29decdad8ea91..a294a5edeeb341cc80ccf8f536c0d885496facd7 100644
--- a/IO/Infovis/Testing/Cxx/CMakeLists.txt
+++ b/IO/Infovis/Testing/Cxx/CMakeLists.txt
@@ -1,34 +1,9 @@
 if(VTK_DATA_ROOT)
-  set (NEEDS_DATA
+  vtk_add_test_cxx(IO
     TestBiomTableReader.cxx
     TestNewickTreeReader.cxx
     TestMultiNewickTreeReader.cxx
     TestTulipReaderProperties.cxx
-  )
+    )
+  vtk_test_cxx_executable(${vtk-module}CxxTests)
 endif()
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${NEEDS_DATA}
-  # TestTulipReader.cxx           # todo (unsatisfied deps)
-  # TestTulipReaderClusters.cxx   # todo (unsatisfied deps)
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-            COMMAND ${vtk-module}CxxTests ${TName}
-                                          -D ${VTK_DATA_ROOT}
-                                          -T ${VTK_TEST_OUTPUT_DIR}
-                                          -V Baseline/${vtk-module}/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
diff --git a/IO/LSDyna/Testing/Cxx/CMakeLists.txt b/IO/LSDyna/Testing/Cxx/CMakeLists.txt
index e09412274cc99a1fb7333cd33ea6251239d2c6a0..5661b3bfa39576dc7c6213ccdba6211a36cea875 100644
--- a/IO/LSDyna/Testing/Cxx/CMakeLists.txt
+++ b/IO/LSDyna/Testing/Cxx/CMakeLists.txt
@@ -1,26 +1,5 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(IO LARGE_DATA
   TestLSDynaReader.cxx
   TestLSDynaReaderSPH.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_LARGE_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_LARGE_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/Legacy/Testing/Cxx/CMakeLists.txt b/IO/Legacy/Testing/Cxx/CMakeLists.txt
index 8eadae40b90424a16a0233bc9ed5ad6d31270fae..c2d83cfa73f619f135fad1cadd3bfbb2d9c278cf 100644
--- a/IO/Legacy/Testing/Cxx/CMakeLists.txt
+++ b/IO/Legacy/Testing/Cxx/CMakeLists.txt
@@ -1,23 +1,4 @@
-set(MyTests ${MyTests}
-  TestLegacyCompositeDataReaderWriter.cxx
-)
-
-# Tests with data
 if(VTK_DATA_ROOT)
-  # Use the testing object factory, to reduce boilerplate code in tests.
-  include(vtkTestingObjectFactory)
-  vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-  set(TestsToRun ${Tests})
-  list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-  # Add all the executables
-  foreach(test ${TestsToRun})
-    get_filename_component(TName ${test} NAME_WE)
-      add_test(NAME ${vtk-module}-${TName}
-        COMMAND ${vtk-module}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_TEST_OUTPUT_DIR}
-          -V Baseline/Parallel/${TName}.png)
-  endforeach ()
+  vtk_add_test_cxx(TestLegacyCompositeDataReaderWriter.cxx Parallel)
+  vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
 endif()
diff --git a/IO/Movie/Testing/Cxx/CMakeLists.txt b/IO/Movie/Testing/Cxx/CMakeLists.txt
index 50c67cd4edef537f085454af8ff57db899e54dcc..b70915da487713df6c9d913d9372691046fec379 100644
--- a/IO/Movie/Testing/Cxx/CMakeLists.txt
+++ b/IO/Movie/Testing/Cxx/CMakeLists.txt
@@ -8,29 +8,9 @@ if(vtkIOMovie_vtkoggtheora)
   list(APPEND TEST_SRC TestOggTheoraWriter.cxx)
 endif()
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(IO
   # TestMovieWriter.cxx           # fixme (deps not satisfied)
   ${TEST_SRC}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
+  )
 
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -T ${VTK_TEST_OUTPUT_DIR})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/MySQL/Testing/Cxx/CMakeLists.txt b/IO/MySQL/Testing/Cxx/CMakeLists.txt
index c3696119e07f17741ff7e1f56e03a295b9d55526..4013c51ee0906c609943e7eca553ed113a06901d 100644
--- a/IO/MySQL/Testing/Cxx/CMakeLists.txt
+++ b/IO/MySQL/Testing/Cxx/CMakeLists.txt
@@ -4,30 +4,17 @@ if(VTK_MYSQL_TEST_URL)
 
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-  create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-    TestMySQLDatabase.cxx
-    TestMySQLTableReadWrite.cxx
-    EXTRA_INCLUDE vtkTestDriver.h
-  )
-
-  vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-  set(TestsToRun ${Tests})
-  list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-  add_test(NAME ${vtk-module}Cxx-TestMySQLDatabase
-           COMMAND ${vtk-module}CxxTests TestMySQLDatabase)
-
+  vtk_add_test_cxx(TestMySQLDatabase.cxx NO_DATA NO_VALID)
   if(VTK_DATA_ROOT)
     if(WIN32)
-      add_test(NAME ${vtk-module}Cxx-TestMySQLTableReadWrite
-               COMMAND ${vtk-module}CxxTests TestMySQLTableReadWrite
-                       ${VTK_DATA_ROOT}/Baseline/IO/simple_table_win.vtk)
+      set(TestMySQLTableReadWrite_ARGS
+        ${VTK_DATA_ROOT}/Baseline/IO/simple_table_win.vtk)
     else()
-      add_test(NAME ${vtk-module}Cxx-TestMySQLTableReadWrite
-               COMMAND ${vtk-module}CxxTests TestMySQLTableReadWrite
-                       ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk)
+      set(TestMySQLTableReadWrite_ARGS
+        ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk)
     endif()
+    vtk_add_test_cxx(TestMySQLTableReadWrite.cxx NO_DATA NO_VALID)
   endif()
 
+  vtk_test_cxx_executable(${vtk-module}CxxTests)
 endif()
diff --git a/IO/NetCDF/Testing/Cxx/CMakeLists.txt b/IO/NetCDF/Testing/Cxx/CMakeLists.txt
index 093b713ccac9027a0467a21cd1c5f0476315b900..d0fbfe619d1714d9f4c6bc2744d86f87796199e8 100644
--- a/IO/NetCDF/Testing/Cxx/CMakeLists.txt
+++ b/IO/NetCDF/Testing/Cxx/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(VTK_LARGE_DATA_ROOT)
-  set (NEEDS_LARGE_DATA
+  vtk_add_test_cxx(IO LARGE_DATA
     SLACMultipleModes.cxx
     SLACParticleReader.cxx
     SLACReaderLinear.cxx
@@ -8,29 +8,5 @@ if(VTK_LARGE_DATA_ROOT)
     TestNetCDFCAMReader.cxx
     TestNetCDFPOPReader.cxx
     )
+  vtk_test_cxx_executable(${vtk-module}CxxTests)
 endif()
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${NEEDS_LARGE_DATA}
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_LARGE_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_LARGE_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
diff --git a/IO/ODBC/Testing/Cxx/CMakeLists.txt b/IO/ODBC/Testing/Cxx/CMakeLists.txt
index 063b3a453eca07341abdcc36f9c99b5ce5864f40..cba1c69fd6d7ac2aa5a3a2e7f04c9306e0463db1 100644
--- a/IO/ODBC/Testing/Cxx/CMakeLists.txt
+++ b/IO/ODBC/Testing/Cxx/CMakeLists.txt
@@ -4,27 +4,6 @@ if(VTK_ODBC_TEST_DSN)
 
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-  create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-    TestODBCDatabase.cxx
-    EXTRA_INCLUDE vtkTestDriver.h
-    )
-
-  vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-  set(TestsToRun ${Tests})
-  list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-  # Add all the executables
-  foreach(test ${TestsToRun})
-    get_filename_component(TName ${test} NAME_WE)
-    if(VTK_DATA_ROOT)
-      add_test(NAME ${vtk-module}Cxx-${TName}
-        COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/${vtk-module}/${TName}.png)
-    else()
-      add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-    endif()
-  endforeach()
+  vtk_add_test_cxx(TestODBCDatabase.cxx NO_DATA NO_VALID)
+  vtk_test_cxx_executable(${vtk-module}CxxTests)
 endif()
diff --git a/IO/PLY/Testing/Cxx/CMakeLists.txt b/IO/PLY/Testing/Cxx/CMakeLists.txt
index a1a472db9d6ce59bbe8d48f1256756d4dbd851da..d13a322e8dcec23b72c238811ecc552abacbc351 100644
--- a/IO/PLY/Testing/Cxx/CMakeLists.txt
+++ b/IO/PLY/Testing/Cxx/CMakeLists.txt
@@ -1,24 +1,2 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  TestPLYReader.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_add_test_cxx(TestPLYReader.cxx IO)
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/ParallelNetCDF/Testing/Cxx/CMakeLists.txt b/IO/ParallelNetCDF/Testing/Cxx/CMakeLists.txt
index 7d1025746becc801116cc96b59ce52396fa19508..fca845770ede7bcd33bff28e0c67c8a512ce4ea2 100644
--- a/IO/ParallelNetCDF/Testing/Cxx/CMakeLists.txt
+++ b/IO/ParallelNetCDF/Testing/Cxx/CMakeLists.txt
@@ -1,15 +1,4 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(IO LARGE_DATA
   TestPNetCDFPOPReader.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-if(VTK_LARGE_DATA_ROOT)
-  add_test(NAME vtkIOParallelNetCDFCxx-TestPNetCDFPOPReader
-    COMMAND ${vtk-module}CxxTests TestPNetCDFPOPReader
-    -D ${VTK_LARGE_DATA_ROOT}
-    -T ${VTK_TEST_OUTPUT_DIR}
-    -V Baseline/IO/TestNetCDFPOPReader.png)
-endif(VTK_LARGE_DATA_ROOT)
\ No newline at end of file
+  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/IO/PostgreSQL/Testing/Cxx/CMakeLists.txt b/IO/PostgreSQL/Testing/Cxx/CMakeLists.txt
index edfe985badb0aab538dadd1c39ec3d8e6da30915..023f3bb1dc254deb42f799458c0f35b06add6d78 100644
--- a/IO/PostgreSQL/Testing/Cxx/CMakeLists.txt
+++ b/IO/PostgreSQL/Testing/Cxx/CMakeLists.txt
@@ -1,34 +1,20 @@
 if(VTK_PSQL_TEST_URL)
-
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkIOPostgresSQLTestingCxxConfigure.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/vtkIOPostgresSQLTestingCxxConfigure.h)
 
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-  create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-    TestPostgreSQLDatabase
-    TestPostgreSQLTableReadWrite.cxx
-    EXTRA_INCLUDE vtkTestDriver.h
-  )
-
-  vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-  set(TestsToRun ${Tests})
-  list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-  add_test(NAME ${vtk-module}Cxx-TestPostgreSQLDatabase
-           COMMAND ${vtk-module}CxxTests TestPostgreSQLDatabase)
-
+  vtk_add_test_cxx(TestPostgreSQLDatabase.cxx NO_DATA NO_VALID)
   if(VTK_DATA_ROOT)
     if(WIN32)
-      add_test(NAME ${vtk-module}Cxx-TestPostgreSQLTableReadWrite
-               COMMAND ${vtk-module}CxxTests TestPostgreSQLTableReadWrite
-                       ${VTK_DATA_ROOT}/Baseline/IO/simple_table_win.vtk)
+      set(TestPostgreSQLTableReadWrite_ARGS
+        ${VTK_DATA_ROOT}/Baseline/IO/simple_table_win.vtk)
     else()
-      add_test(NAME ${vtk-module}Cxx-TestPostgreSQLTableReadWrite
-               COMMAND ${vtk-module}CxxTests TestPostgreSQLTableReadWrite
-                       ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk)
+      set(TestPostgreSQLTableReadWrite_ARGS
+        ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk)
     endif()
+    vtk_add_test_cxx(TestPostgreSQLTableReadWrite.cxx NO_DATA NO_VALID)
   endif()
 
+  vtk_test_cxx_executable(${vtk-module}CxxTests)
 endif()
diff --git a/IO/SQL/Testing/Cxx/CMakeLists.txt b/IO/SQL/Testing/Cxx/CMakeLists.txt
index 2e2aed01ee34ffa8aa46ce5f401e740e4b8efaf0..f0883a3b88be84e2c5ce8d29a67896b30821cf37 100644
--- a/IO/SQL/Testing/Cxx/CMakeLists.txt
+++ b/IO/SQL/Testing/Cxx/CMakeLists.txt
@@ -1,38 +1,15 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(IO
   TestSQLDatabaseSchema.cxx
   TestSQLiteDatabase.cxx
-  TestSQLiteTableReadWrite.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-list(REMOVE_ITEM TestsToRun TestSQLiteTableReadWrite.cxx)
+  )
 
 if(VTK_DATA_ROOT)
-  add_test(NAME ${vtk-module}Cxx-SQLiteTableReadWrite
-    COMMAND ${vtk-module}CxxTests TestSQLiteTableReadWrite
-      ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk
-  )
-  set_tests_properties(vtkIOSQLCxx-SQLiteTableReadWrite PROPERTIES RUN_SERIAL 1)
+  set(TestSQLiteTableReadWrite_ARGS ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk)
+  vtk_add_test_cxx(TestSQLiteTableReadWrite.cxx NO_DATA NO_VALID NO_OUTPUT)
+  set_tests_properties(vtkIOSQLCxx-TestSQLiteTableReadWrite PROPERTIES RUN_SERIAL 1)
 endif()
 
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
 
 # Run these serial to avoid intermittent test failures on machines
 # that do parallel testing
diff --git a/IO/XML/Testing/Cxx/CMakeLists.txt b/IO/XML/Testing/Cxx/CMakeLists.txt
index 38268a9a5612caebfc9d22beaad896cf1d332abb..11129ea6964cca185d7c5bec059843f20b3a4257 100644
--- a/IO/XML/Testing/Cxx/CMakeLists.txt
+++ b/IO/XML/Testing/Cxx/CMakeLists.txt
@@ -1,39 +1,15 @@
 if(VTK_DATA_ROOT)
-  set (NEEDS_DATA
+  vtk_add_test_cxx(IO
     TestAMRXMLIO.cxx
     TestXMLHierarchicalBoxDataFileConverter.cxx
     TestXMLUnstructuredGridReader.cxx
     )
+  set(TestXML_ARGS ${VTK_DATA_ROOT}/Data/sample.xml)
+  vtk_add_test_cxx(TestXML.cxx NO_DATA NO_VALID NO_OUTPUT)
 endif()
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${NEEDS_DATA}
+vtk_add_test_cxx(IO
   TestDataObjectXMLIO.cxx
-  TestXML.cxx
-  EXTRA_INCLUDE vtkTestDriver.h
-)
+  )
 
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-list(REMOVE_ITEM TestsToRun TestXML.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/IO/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
-
-if(VTK_DATA_ROOT)
-  add_test(NAME ${vtk-module}Cxx-XML
-    COMMAND ${vtk-module}CxxTests TestXML ${VTK_DATA_ROOT}/Data/sample.xml)
-endif()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Imaging/Core/Testing/Cxx/CMakeLists.txt b/Imaging/Core/Testing/Cxx/CMakeLists.txt
index 57b86e29f8fb6c61ce643818a6517e1e0d5cf2c3..a683142223ec8b84ac5e4374089117b913b732bb 100644
--- a/Imaging/Core/Testing/Cxx/CMakeLists.txt
+++ b/Imaging/Core/Testing/Cxx/CMakeLists.txt
@@ -1,5 +1,4 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  TestImageStencilData.cxx
+vtk_add_test_cxx(Imaging
   # FastSplatter.cxx # todo (unsatistfied deps)
   ImageAccumulate.cxx
   # ImageAutoRange.cxx # todo (unsatistfied deps)
@@ -12,17 +11,12 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   ImageWeightedSum.cxx
   # ImportExport.cxx # todo (unsatistfied deps)
   TestUpdateExtentReset.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-list(REMOVE_ITEM TestsToRun TestImageStencilData.cxx)
+  )
 
 # The stencil test is special
+set_property(DIRECTORY APPEND PROPERTY VTK_TEST_CXX_SOURCES
+  TestImageStencilData.cxx
+  )
 if(VTK_DATA_ROOT)
   add_test(NAME ${vtk-module}Cxx-AddStencilData
     COMMAND ${vtk-module}CxxTests TestImageStencilData 1
@@ -41,17 +35,4 @@ if(VTK_DATA_ROOT)
       -V Baseline/Hybrid/TestClipStencilData.png)
 endif()
 
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Imaging/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Imaging/Hybrid/Testing/Cxx/CMakeLists.txt b/Imaging/Hybrid/Testing/Cxx/CMakeLists.txt
index c9fb8d543f8b520160d0575fd5cbf5ce33b85fdc..8baf9ba82d15df9f6d07e62e20c45b39560c8ac6 100644
--- a/Imaging/Hybrid/Testing/Cxx/CMakeLists.txt
+++ b/Imaging/Hybrid/Testing/Cxx/CMakeLists.txt
@@ -1,16 +1,2 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  TestSampleFunction.cxx
-
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName})
-endforeach()
+vtk_add_test_cxx(TestSampleFunction.cxx NO_DATA NO_VALID NO_OUTPUT)
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Infovis/BoostGraphAlgorithms/Testing/Cxx/CMakeLists.txt b/Infovis/BoostGraphAlgorithms/Testing/Cxx/CMakeLists.txt
index f1bab5a627792ef12ac1756e1fa24ec61ab8d907..d710250e6bfaea57f1381c9149a1e18279345bd8 100644
--- a/Infovis/BoostGraphAlgorithms/Testing/Cxx/CMakeLists.txt
+++ b/Infovis/BoostGraphAlgorithms/Testing/Cxx/CMakeLists.txt
@@ -1,7 +1,7 @@
 find_package(Boost REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Infovis
   # BoostArrayLogWeighting.cxx    # todo (unsatisfied deps)
   BoostArrayRandomSparseArraySource.cxx
   TestBoostAdapter.cxx
@@ -11,26 +11,6 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   TestBoostDividedEdgeBundling.cxx
   TestBoostExtractLargestComponent.cxx
   TestBoostSplitTableField.cxx
+  )
 
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Infovis/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Infovis/Core/Testing/Cxx/CMakeLists.txt b/Infovis/Core/Testing/Cxx/CMakeLists.txt
index 635dfe5c723cbb609c27b375954a8819490317ff..ce800632baef23bbcfd6d824b62a2a051cbdb39b 100644
--- a/Infovis/Core/Testing/Cxx/CMakeLists.txt
+++ b/Infovis/Core/Testing/Cxx/CMakeLists.txt
@@ -2,7 +2,7 @@ if(VTK_DATA_ROOT)
   set (NEEDS_DATA TestStringToNumeric.cxx TestMergeTables.cxx)
 endif()
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Infovis
   ${NEEDS_DATA}
   ArraySparseArrayToTable.cxx
   ArrayTableToSparseArray.cxx
@@ -24,26 +24,6 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   TestThresholdTable.cxx
   TestTreeDifferenceFilter.cxx
   # TestTimePoint.cxx             # deprecated dep
+  )
 
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Infovis/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Infovis/Layout/Testing/Cxx/CMakeLists.txt b/Infovis/Layout/Testing/Cxx/CMakeLists.txt
index 8e24655de8717cca4bac7ea486a1ee5f546623e0..b77607f2e56c1a50bc28cffbc4d2f956977beb6b 100644
--- a/Infovis/Layout/Testing/Cxx/CMakeLists.txt
+++ b/Infovis/Layout/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Infovis
   # TestAssignCoordinates.cxx # todo (unsatisfied deps)
   # TestChacoGraphReader.cxx # todo (unsatisfied deps)
   TestCirclePackLayoutStrategy.cxx
@@ -6,26 +6,6 @@ create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
   TestGraphLayoutStrategy.cxx
   TestIncrementalForceLayout.cxx
   TestTreeMapLayoutStrategy.cxx
+  )
 
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Infovis/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Interaction/Widgets/Testing/Cxx/CMakeLists.txt b/Interaction/Widgets/Testing/Cxx/CMakeLists.txt
index 0e711677ff04774d756eb824958e0f96135107f6..cf4ff0c3bb62a5d77b1ad1b6d20dabaea5d17a86 100644
--- a/Interaction/Widgets/Testing/Cxx/CMakeLists.txt
+++ b/Interaction/Widgets/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,5 @@
-set(MyTests
+set(TerrainPolylineEditor_ARGS -ProjectionMode 2 -HeightOffset 100)
+vtk_add_test_cxx(Widgets
   BoxWidget.cxx
   BoxWidget2.cxx
   # ImagePlaneWidget.cxx # todo (unsatisfied deps)
@@ -71,12 +72,11 @@ set(MyTests
   vtkSplineWidget2Test1.cxx
   vtkTextRepresentationTest1.cxx
   vtkTextWidgetTest1.cxx
-)
+  )
 
 # Tests with data
 if(VTK_DATA_ROOT)
-  set(MyTests
-    ${MyTests}
+  vtk_add_test_cxx(Widgets
     TestDijkstraGraphGeodesicPath.cxx
     TestLineWidget.cxx
     TestLineWidget2.cxx
@@ -93,43 +93,10 @@ if(VTK_DATA_ROOT)
 endif()
 
 if(NOT VTK_OPENGL_HAS_OSMESA)
-  set(MyTests
-    ${MyTests} TestPickingManagerWidgets.cxx)
+  vtk_add_test_cxx(TestPickingManagerWidgets.cxx Widgets)
 endif()
 
-
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-list(REMOVE_ITEM TestsToRun TerrainPolylineEditor.cxx)
-
-if(VTK_DATA_ROOT)
-  add_test(NAME ${vtk-module}Cxx-TerrainPolylineEditor
-    COMMAND ${vtk-module}CxxTests TerrainPolylineEditor
-      -ProjectionMode 2
-      -HeightOffset 100
-      -D ${VTK_DATA_ROOT}
-      -T ${VTK_TEST_OUTPUT_DIR}
-      -V Baseline/Widgets/TerrainPolylineEditor.png)
-endif()
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Widgets/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
 
 if (VTK_DATA_ROOT)
   set_tests_properties(${vtk-module}Cxx-TerrainPolylineEditor
diff --git a/Rendering/Annotation/Testing/Cxx/CMakeLists.txt b/Rendering/Annotation/Testing/Cxx/CMakeLists.txt
index 4df6c2b0147087a345579fbc8cfa81e7215d65d2..9341a0bf1d98c37a06b79b6df8d48599feb1c4d6 100644
--- a/Rendering/Annotation/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/Annotation/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MyTests
+vtk_add_test_cxx(Hybrid
   # TestAxisActor3D.cxx # todo (may not be in vtk in the first place)
   TestBarChartActor.cxx
   TestCaptionActor2D.cxx
@@ -25,26 +25,6 @@ set(MyTests
   TestCubeAxesInnerGridClosest.cxx
   TestCubeAxesInnerGridFurthest.cxx
   TestXYPlotActor.cxx
-)
+  )
 
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Hybrid/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Rendering/Core/Testing/Cxx/CMakeLists.txt b/Rendering/Core/Testing/Cxx/CMakeLists.txt
index 367025a987f7345973734f1be658394e8dc6386c..a718ea250a9999fe6e0e85b47bd28c4227c698dc 100644
--- a/Rendering/Core/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/Core/Testing/Cxx/CMakeLists.txt
@@ -1,28 +1,9 @@
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
+vtk_add_test_cxx(Rendering
   TestPickingManager.cxx
   TestSplitViewportStereoHorizontal.cxx
   # otherLookupTable.cxx             # fixme
   # otherLookupTableWithEnabling.cxx # fixme
   # TestHierarchicalBoxPipeline.cxx  # legacy code
-  EXTRA_INCLUDE vtkTestDriver.h
-)
+  )
 
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Rendering/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests)
diff --git a/Rendering/FreeType/Testing/Cxx/CMakeLists.txt b/Rendering/FreeType/Testing/Cxx/CMakeLists.txt
index b6fe064d3a76ea095a7ae7d2e84e687045895380..a5e499f1c8aaa59a6c0d0f4fc488750960dd8040 100644
--- a/Rendering/FreeType/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/FreeType/Testing/Cxx/CMakeLists.txt
@@ -14,21 +14,15 @@ if(NOT MATPLOTLIB_FOUND)
 endif()
 
 # add tests that do not require data or produce vector output
-set(MyTests
-  TestMathTextFreeTypeTextRendererNoMath.cxx
-  )
+vtk_add_test_cxx(TestMathTextFreeTypeTextRendererNoMath.cxx Rendering)
 
 if(VTK_DATA_ROOT)
   # add tests that require data
-  set(MyTests ${MyTests}
-    TestFTStringToPath.cxx
-    )
+  vtk_add_test_cxx(TestFTStringToPath.cxx Rendering)
 endif()
 
 if(MATPLOTLIB_FOUND)
-  set(MyTests ${MyTests}
-    TestMathTextFreeTypeTextRenderer.cxx
-    )
+  vtk_add_test_cxx(TestMathTextFreeTypeTextRenderer.cxx Rendering)
 endif()
 
 # This benchmark takes a while to run and can't fail, so disable it by default:
@@ -38,33 +32,7 @@ option(VTK_BUILD_FREETYPE_BENCHMARK
 mark_as_advanced(VTK_BUILD_FREETYPE_BENCHMARK)
 
 if(VTK_BUILD_FREETYPE_BENCHMARK)
-  set(MyTests ${MyTests} BenchmarkFreeTypeRendering.cxx)
+  vtk_add_test_cxx(BenchmarkFreeTypeRendering.cxx Rendering)
 endif()
 
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    if(${${TName}Error})
-      set(_error_threshold ${${TName}Error})
-    else()
-      set(_error_threshold 10)
-    endif()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Rendering/${TName}.png
-        -E ${_error_threshold})
-  else()
-    add_test(NAME FreeType-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Rendering/FreeTypeFontConfig/Testing/Cxx/CMakeLists.txt b/Rendering/FreeTypeFontConfig/Testing/Cxx/CMakeLists.txt
index 4594f44734ce7b27e8c775028380067f42eda302..6e56a0c0daad2b9bfc00594cefd61a81fb89fe5c 100644
--- a/Rendering/FreeTypeFontConfig/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/FreeTypeFontConfig/Testing/Cxx/CMakeLists.txt
@@ -1,32 +1,2 @@
-# add tests that do not require data
-set(MyTests
-  TestSystemFontRendering
-  )
-
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    if(${${TName}Error})
-      set(_error_threshold ${${TName}Error})
-    else()
-      set(_error_threshold 10)
-    endif()
-    add_test(NAME Charts-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Rendering/${TName}.png
-        -E ${_error_threshold})
-  else()
-    add_test(NAME Charts-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_add_test_cxx(TestSystemFontRendering.cxx Rendering)
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Rendering/HybridOpenGL/Testing/Cxx/CMakeLists.txt b/Rendering/HybridOpenGL/Testing/Cxx/CMakeLists.txt
index b4e2bd663211265e46266c981fd40635a3520a54..aef07b2a26eab40425599ce221165527d405efe4 100644
--- a/Rendering/HybridOpenGL/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/HybridOpenGL/Testing/Cxx/CMakeLists.txt
@@ -1,43 +1,14 @@
-set(MyTests "")
-
 if(NOT APPLE)
   # This is from the old build system - not working on Apple platform.
-  list(APPEND MyTests
+  vtk_add_test_cxx(Hybrid
     TestStructuredGridLIC2DXSlice.cxx
     TestStructuredGridLIC2DYSlice.cxx
     TestStructuredGridLIC2DZSlice.cxx
     )
   if(VTK_DATA_ROOT)
-    list(APPEND MyTests
-      TestSurfaceLIC.cxx
-      TestImageDataLIC2D.cxx # This was segfaulting before modularization (and is now).
-      )
+    vtk_add_test_cxx(TestSurfaceLIC.cxx Rendering)
+    vtk_add_test_cxx(TestImageDataLIC2D.cxx Hybrid) # This was segfaulting before modularization (and is now).
   endif()
 endif()
 
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    set(_basedir Hybrid)
-    if("${TName}" STREQUAL "TestSurfaceLIC")
-      set(_basedir Rendering)
-    endif()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/${_basedir}/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
diff --git a/Rendering/Matplotlib/Testing/Cxx/CMakeLists.txt b/Rendering/Matplotlib/Testing/Cxx/CMakeLists.txt
index 52f47b83a2b056f3ef28573ccdee9cb165cade84..e9cf90c5b789a8412fd28e886542774613e855e9 100644
--- a/Rendering/Matplotlib/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/Matplotlib/Testing/Cxx/CMakeLists.txt
@@ -25,7 +25,7 @@ if(MATPLOTLIB_FOUND)
 
   if(VTK_DATA_ROOT)
     # add tests that require data
-    set(MyTests
+    vtk_add_test_cxx(Rendering
       TestContextMathTextImage.cxx
       TestMathTextActor.cxx
       TestMathTextActor3D.cxx
@@ -33,38 +33,13 @@ if(MATPLOTLIB_FOUND)
       TestStringToPath.cxx
       TestIndexedLookupScalarBar.cxx
       TestScalarBarCombinatorics.cxx
-      ${GL2PSTests}
       )
   endif()
 endif()
 
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
+vtk_add_test_cxx(${GL2PSTests} Rendering)
 
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    if(${${TName}Error})
-      set(_error_threshold ${${TName}Error})
-    else()
-      set(_error_threshold 10)
-    endif()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Rendering/${TName}.png
-        -E ${_error_threshold})
-  else()
-    add_test(NAME MathText-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
 
 # The GL2PS tests produce postscript output, which cannot be compared using
 # the built-in image regression framework. The tests added above will create the
diff --git a/Rendering/OpenGL/Testing/Cxx/CMakeLists.txt b/Rendering/OpenGL/Testing/Cxx/CMakeLists.txt
index d61e724c446dbc51abdc1714710cf061781c2b39..f785845cb73e4a0519bf984552cefca781d283bb 100644
--- a/Rendering/OpenGL/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/OpenGL/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(RenderingTests
+vtk_add_test_cxx(NO_DATA NO_VALID
   otherCoordinate.cxx
   TestPriorityStreaming.cxx
   )
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(
 )
 
 # For tests that actually use a vtkRenderWindow
-SET(RenderingTestsWithArguments
+vtk_add_test_cxx(Rendering
   LoadOpenGLExtension.cxx
   TestActorLightingFlag.cxx
   TestAnimationScene.cxx
@@ -59,7 +59,6 @@ SET(RenderingTestsWithArguments
   TestResetCameraVerticalAspectRatioParallel.cxx
   TestSetImageOrientation.cxx
   TestSobelGradientMagnitudePass.cxx
-  TestShadowMapPass.cxx
   TestTextActorAlphaBlending.cxx
   TestTextActorDepthPeeling.cxx
   TestTextActor3DAlphaBlending.cxx
@@ -75,23 +74,18 @@ SET(RenderingTestsWithArguments
   TestTranslucentLUTTextureAlphaBlending.cxx
   TestTranslucentLUTTextureDepthPeeling.cxx
   )
-
-if(APPLE)
-  list(REMOVE_ITEM RenderingTestsWithArguments TestShadowMapPass.cxx)
+if(NOT APPLE)
+  vtk_add_test_cxx(TestShadowMapPass.cxx Rendering)
 endif()
 
 if(WIN32 AND NOT VTK_USE_X)
-  set(RenderingTestsWithArguments
-    ${RenderingTestsWithArguments}
-    TestWin32OpenGLRenderWindow.cxx
-    )
+  vtk_add_test_cxx(TestWin32OpenGLRenderWindow.cxx Rendering)
 endif()
 
 include_directories(${OPENGL_INCLUDE_DIR})
 
 if(VTK_DATA_ROOT)
-  set(RenderingTestsWithArguments
-    ${RenderingTestsWithArguments}
+  vtk_add_test_cxx(Rendering
     TestAreaSelections.cxx
     TestGlyph3DMapperArrow.cxx
     TestMultiblockDisplayProperties.cxx
@@ -113,8 +107,7 @@ if(VTK_DATA_ROOT)
 endif()
 
 if(VTK_USE_DISPLAY AND VTK_DATA_ROOT)
-  set(RenderingTestsWithArguments
-    ${RenderingTestsWithArguments}
+  vtk_add_test_cxx(Rendering
     RenderNonFinite.cxx
     SurfacePlusEdges.cxx
     TestLabelPlacementMapper.cxx
@@ -124,18 +117,14 @@ endif()
 set(VTK_USE_GLSL_SHADERS TRUE)
 if(VTK_USE_GLSL_SHADERS)
   # Tests testing GLSL Shaders.
-  set(RenderingTestsWithArguments
-    ${RenderingTestsWithArguments}
+  vtk_add_test_cxx(Rendering
     TestGenericVertexAttributesGLSLCxx.cxx
     TestGenericVertexAttributesGLSLAlphaBlending.cxx
     TestGenericVertexAttributesGLSLDepthPeelingPass.cxx
     )
 endif()
 
-create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
-  ${RenderingTests};${RenderingTestsWithArguments}
-  EXTRA_INCLUDE vtkTestDriver.h
-  )
+vtk_test_cxx_executable(${vtk-module}CxxTests)
 
 set(TEST_FBO_IMPLEMENTATION_EXE
   TestFBOImplementation)
@@ -155,40 +144,10 @@ if(VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
   target_link_libraries(TestFBOImplementation ${OSMESA_LIBRARY})
 endif()
 
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
 if(VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
   target_link_libraries(${vtk-module}CxxTests ${OSMESA_LIBRARY})
 endif()
 
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun ${vtk-module}CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${RenderingTests})
-  get_filename_component(TName ${test} NAME_WE)
-  add_test(NAME ${vtk-module}Cxx-${TName}
-    COMMAND ${vtk-module}CxxTests ${TName}
-      -T ${VTK_TEST_OUTPUT_DIR}
-    )
-endforeach()
-
-foreach(test ${RenderingTestsWithArguments})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/Rendering/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -T ${VTK_TEST_OUTPUT_DIR}
-      )
-  endif()
-endforeach()
-
 # Add other odd tests or executables
 foreach(exe
   TimeRenderer
diff --git a/Rendering/Volume/Testing/Cxx/CMakeLists.txt b/Rendering/Volume/Testing/Cxx/CMakeLists.txt
index 092d0cf0bdfb34968673dcb471920f9a9cbd6271..0bda73d37cf22bfd35e32832bba7abd4f0d3c264 100644
--- a/Rendering/Volume/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/Volume/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MyTests
+vtk_add_test_cxx(VolumeRendering
   HomogeneousRayIntegration.cxx
   LinearRayIntegration.cxx
   PartialPreIntegration.cxx
@@ -25,12 +25,11 @@ set(MyTests
   TestSmartVolumeMapperWindowLevel.cxx
   TestTM3DLightComponents.cxx
   ZsweepConcavities.cxx
-)
+  )
 
 # Tests with data
 if(VTK_DATA_ROOT)
-  set(MyTests
-    ${MyTests}
+  vtk_add_test_cxx(VolumeRendering
     ProjectedTetrahedraZoomIn.cxx
     TestFinalColorWindowLevel.cxx
     TestGPURayCastNearestDataTypesMIP.cxx
@@ -43,29 +42,8 @@ if(VTK_DATA_ROOT)
     )
 endif()
 
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests}
-  ExerciseUnstructuredGridRayCastMapper.cxx )
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_TEST_OUTPUT_DIR}
-        -V Baseline/VolumeRendering/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName}
-      COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY
+  ExerciseUnstructuredGridRayCastMapper.cxx)
 
 if (VTK_DATA_ROOT)
   set_tests_properties(${vtk-module}Cxx-TestProp3DFollower
diff --git a/Views/Infovis/Testing/Cxx/CMakeLists.txt b/Views/Infovis/Testing/Cxx/CMakeLists.txt
index d76ecaec582245158cee2b24319716195d6d2c70..68574042ee7da67c4edcb9cfb1337192e3b875a5 100644
--- a/Views/Infovis/Testing/Cxx/CMakeLists.txt
+++ b/Views/Infovis/Testing/Cxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MyTests
+vtk_add_test_cxx(Views
   TestCoincidentGraphLayoutView.cxx
   TestConeLayoutStrategy.cxx
   TestDendrogramOnly.cxx
@@ -14,30 +14,10 @@ set(MyTests
   TestTreeHeatmapItem.cxx
   TestTreeMapView.cxx
   TestTreeRingView.cxx
-  ${QtTests}
-)
+  )
 
 if( VTK_DATA_ROOT)
-  set(MyTests ${MyTests} TestIconGlyphFilter.cxx)
+  vtk_add_test_cxx(TestIconGlyphFilter.cxx Views)
 endif()
 
-# Use the testing object factory, to reduce boilerplate code in tests.
-include(vtkTestingObjectFactory)
-vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
-
-set(TestsToRun ${Tests})
-list(REMOVE_ITEM TestsToRun CxxTests.cxx)
-
-# Add all the executables
-foreach(test ${TestsToRun})
-  get_filename_component(TName ${test} NAME_WE)
-  if(VTK_DATA_ROOT)
-    add_test(NAME ${vtk-module}Cxx-${TName}
-            COMMAND ${vtk-module}CxxTests ${TName}
-                                          -D ${VTK_DATA_ROOT}
-                                          -T ${VTK_TEST_OUTPUT_DIR}
-                                          -V Baseline/Views/${TName}.png)
-  else()
-    add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})
-  endif()
-endforeach()
+vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)