diff --git a/Clients/ParaView/Testing/XML/CMakeLists.txt b/Clients/ParaView/Testing/XML/CMakeLists.txt
index c9738912ed..53f4e1bd8a 100644
--- a/Clients/ParaView/Testing/XML/CMakeLists.txt
+++ b/Clients/ParaView/Testing/XML/CMakeLists.txt
@@ -65,6 +65,7 @@ ExternalData_Expand_Arguments(ParaViewData _
   "DATA{${paraview_test_data_directory_input}/Data/TestMultipleNumberOfComponentsPlugin.xml}"
   "DATA{${paraview_test_data_directory_input}/Data/VisItBridge/,REGEX:.*}"
   "DATA{${paraview_test_data_directory_input}/Data/amr/,REGEX:.*}"
+  "DATA{${paraview_test_data_directory_input}/Data/amr/wavelet/,REGEX:.*}"
   "DATA{${paraview_test_data_directory_input}/Data/artifact.dta}"
   "DATA{${paraview_test_data_directory_input}/Data/blow.vtk}"
   "DATA{${paraview_test_data_directory_input}/Data/blow_data.myvtk}"
diff --git a/VTKExtensions/FiltersRendering/Testing/CMakeLists.txt b/VTKExtensions/FiltersRendering/Testing/CMakeLists.txt
index 40eb76cd09..a8633ad9a9 100644
--- a/VTKExtensions/FiltersRendering/Testing/CMakeLists.txt
+++ b/VTKExtensions/FiltersRendering/Testing/CMakeLists.txt
@@ -1,6 +1,8 @@
 vtk_module_test_data(
   Data/NE2_ps_bath.png
   Data/table_0.vtt
-  Data/table_1.vtt)
+  Data/table_1.vtt
+  Data/amr/,REGEX:.*
+  Data/amr/wavelet/,REGEX:.*)
 
 add_subdirectory(Cxx)
diff --git a/VTKExtensions/FiltersRendering/Testing/Cxx/CMakeLists.txt b/VTKExtensions/FiltersRendering/Testing/Cxx/CMakeLists.txt
index 2890b4fb3e..7763c87093 100644
--- a/VTKExtensions/FiltersRendering/Testing/Cxx/CMakeLists.txt
+++ b/VTKExtensions/FiltersRendering/Testing/Cxx/CMakeLists.txt
@@ -9,8 +9,7 @@ mark_as_advanced(smooth_flash)
 
 vtk_add_test_cxx(vtkPVVTKExtensionsRenderingCxxTests tests
   NO_VALID NO_OUTPUT
-# This was basically ignored in the previous version.
-#  TestResampledAMRImageSourceWithPointData.cxx
+  TestResampledAMRImageSourceWithPointData.cxx
   TestImageCompressors.cxx
   TestDataTabulator.cxx
   )
diff --git a/VTKExtensions/FiltersRendering/Testing/Cxx/TestResampledAMRImageSourceWithPointData.cxx b/VTKExtensions/FiltersRendering/Testing/Cxx/TestResampledAMRImageSourceWithPointData.cxx
index d19edbce80..5e388074ed 100644
--- a/VTKExtensions/FiltersRendering/Testing/Cxx/TestResampledAMRImageSourceWithPointData.cxx
+++ b/VTKExtensions/FiltersRendering/Testing/Cxx/TestResampledAMRImageSourceWithPointData.cxx
@@ -15,7 +15,6 @@
 #include "vtkCompositeDataPipeline.h"
 #include "vtkDataArray.h"
 #include "vtkDataArraySelection.h"
-#include "vtkGenericDataObjectWriter.h"
 #include "vtkImageData.h"
 #include "vtkInformation.h"
 #include "vtkNew.h"
diff --git a/VTKExtensions/FiltersRendering/vtk.module b/VTKExtensions/FiltersRendering/vtk.module
index 7ff444c724..d0723c7e87 100644
--- a/VTKExtensions/FiltersRendering/vtk.module
+++ b/VTKExtensions/FiltersRendering/vtk.module
@@ -34,6 +34,7 @@ OPTIONAL_DEPENDS
 TEST_DEPENDS
   VTK::CommonSystem
   VTK::IOImage
+  VTK::IOXML
   VTK::TestingCore
   VTK::TestingRendering
 TEST_LABELS