diff --git a/vtkm/filter/Lagrangian.hxx b/vtkm/filter/Lagrangian.hxx
index d22e978ac..f33d1ea61 100644
--- a/vtkm/filter/Lagrangian.hxx
+++ b/vtkm/filter/Lagrangian.hxx
@@ -22,7 +22,6 @@
 #include <vtkm/cont/DataSetFieldAdd.h>
 #include <vtkm/cont/DeviceAdapter.h>
 #include <vtkm/cont/ErrorFilterExecution.h>
-#include <vtkm/io/writer/VTKDataSetWriter.h>
 #include <vtkm/worklet/ParticleAdvection.h>
 #include <vtkm/worklet/WorkletMapField.h>
 #include <vtkm/worklet/particleadvection/GridEvaluators.h>
diff --git a/vtkm/filter/testing/UnitTestGhostCellRemove.cxx b/vtkm/filter/testing/UnitTestGhostCellRemove.cxx
index 615a177a4..e130ed37b 100644
--- a/vtkm/filter/testing/UnitTestGhostCellRemove.cxx
+++ b/vtkm/filter/testing/UnitTestGhostCellRemove.cxx
@@ -17,9 +17,6 @@
 
 #include <vtkm/filter/GhostCellRemove.h>
 
-#include <vtkm/io/writer/VTKDataSetWriter.h>
-
-
 namespace
 {
 
diff --git a/vtkm/filter/testing/UnitTestMeshQualityFilter.cxx b/vtkm/filter/testing/UnitTestMeshQualityFilter.cxx
index df7c4d74a..531d5862b 100644
--- a/vtkm/filter/testing/UnitTestMeshQualityFilter.cxx
+++ b/vtkm/filter/testing/UnitTestMeshQualityFilter.cxx
@@ -28,7 +28,6 @@
 #include <vtkm/cont/testing/Testing.h>
 #include <vtkm/filter/MeshQuality.h>
 #include <vtkm/io/reader/VTKDataSetReader.h>
-#include <vtkm/io/writer/VTKDataSetWriter.h>
 
 //Adapted from vtkm/cont/testing/MakeTestDataSet.h
 //Modified the content of the MakeExplicitDataSetZoo() function
diff --git a/vtkm/io/CMakeLists.txt b/vtkm/io/CMakeLists.txt
index e6f070305..62061203f 100644
--- a/vtkm/io/CMakeLists.txt
+++ b/vtkm/io/CMakeLists.txt
@@ -32,3 +32,4 @@ target_link_libraries(vtkm_io PUBLIC vtkm_cont PRIVATE vtkm_lodepng)
 add_subdirectory(internal)
 add_subdirectory(reader)
 add_subdirectory(writer)
+add_subdirectory(testing)
diff --git a/vtkm/io/writer/testing/CMakeLists.txt b/vtkm/io/testing/CMakeLists.txt
similarity index 100%
rename from vtkm/io/writer/testing/CMakeLists.txt
rename to vtkm/io/testing/CMakeLists.txt
diff --git a/vtkm/io/writer/testing/UnitTestVTKDataSetWriter.cxx b/vtkm/io/testing/UnitTestVTKDataSetWriter.cxx
similarity index 91%
rename from vtkm/io/writer/testing/UnitTestVTKDataSetWriter.cxx
rename to vtkm/io/testing/UnitTestVTKDataSetWriter.cxx
index 93c0e8bc8..64a0dba23 100644
--- a/vtkm/io/writer/testing/UnitTestVTKDataSetWriter.cxx
+++ b/vtkm/io/testing/UnitTestVTKDataSetWriter.cxx
@@ -11,7 +11,7 @@
 #include <complex>
 #include <cstdio>
 #include <vector>
-#include <vtkm/io/writer/VTKDataSetWriter.h>
+#include <vtkm/io/VTKDataSetWriter.h>
 
 #include <vtkm/cont/testing/MakeTestDataSet.h>
 #include <vtkm/cont/testing/Testing.h>
@@ -25,7 +25,7 @@ namespace
 void TestVTKWriteTestData(const std::string& methodName, const vtkm::cont::DataSet& data)
 {
   std::cout << "Writing " << methodName << std::endl;
-  vtkm::io::writer::VTKDataSetWriter writer(methodName + ".vtk");
+  vtkm::io::VTKDataSetWriter writer(methodName + ".vtk");
   writer.WriteDataSet(data);
 }
 
@@ -51,7 +51,7 @@ void TestVTKExplicitWrite()
   WRITE_FILE(Make3DExplicitDataSetCowNose);
 
   std::cout << "Force writer to output an explicit grid as points" << std::endl;
-  vtkm::io::writer::VTKDataSetWriter writer("Make3DExplicitDataSet0-no-grid.vtk");
+  vtkm::io::VTKDataSetWriter writer("Make3DExplicitDataSet0-no-grid.vtk");
   writer.WriteDataSet(tds.Make3DExplicitDataSet0(), true);
 }
 
@@ -76,7 +76,7 @@ void TestVTKUniformWrite()
   WRITE_FILE(Make3DRegularDataSet1);
 
   std::cout << "Force writer to output a uniform grid as points" << std::endl;
-  vtkm::io::writer::VTKDataSetWriter writer("Make3DUniformDataSet0-no-grid.vtk");
+  vtkm::io::VTKDataSetWriter writer("Make3DUniformDataSet0-no-grid.vtk");
   writer.WriteDataSet(tds.Make3DUniformDataSet0(), true);
 }
 
@@ -89,7 +89,7 @@ void TestVTKRectilinearWrite()
   WRITE_FILE(Make3DRectilinearDataSet0);
 
   std::cout << "Force writer to output a rectilinear grid as points" << std::endl;
-  vtkm::io::writer::VTKDataSetWriter writer("Make3DRectilinearDataSet0-no-grid.vtk");
+  vtkm::io::VTKDataSetWriter writer("Make3DRectilinearDataSet0-no-grid.vtk");
   writer.WriteDataSet(tds.Make3DRectilinearDataSet0(), true);
 }
 
@@ -126,7 +126,7 @@ void TestVTKCompoundWrite()
   }
 
   dsf.AddPointField(dataSet, "z", points.data(), static_cast<vtkm::Id>(points.size()));
-  vtkm::io::writer::VTKDataSetWriter writer("chirp.vtk");
+  vtkm::io::VTKDataSetWriter writer("chirp.vtk");
   writer.WriteDataSet(dataSet);
   std::remove("chirp.vtk");
 }
diff --git a/vtkm/io/writer/CMakeLists.txt b/vtkm/io/writer/CMakeLists.txt
index 5b9dcfe97..1bebb0959 100644
--- a/vtkm/io/writer/CMakeLists.txt
+++ b/vtkm/io/writer/CMakeLists.txt
@@ -13,6 +13,3 @@ set(headers
   )
 
 vtkm_declare_headers(${headers})
-
-#-----------------------------------------------------------------------------
-add_subdirectory(testing)
diff --git a/vtkm/rendering/testing/UnitTestScalarRenderer.cxx b/vtkm/rendering/testing/UnitTestScalarRenderer.cxx
index 4e6392d40..845dabfd6 100644
--- a/vtkm/rendering/testing/UnitTestScalarRenderer.cxx
+++ b/vtkm/rendering/testing/UnitTestScalarRenderer.cxx
@@ -8,7 +8,7 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
-#include <vtkm/io/writer/VTKDataSetWriter.h>
+#include <vtkm/io/VTKDataSetWriter.h>
 #include <vtkm/rendering/ScalarRenderer.h>
 #include <vtkm/rendering/testing/RenderTest.h>
 
@@ -31,7 +31,7 @@ void RenderTests()
   vtkm::rendering::ScalarRenderer::Result res = renderer.Render(camera);
 
   vtkm::cont::DataSet result = res.ToDataSet();
-  vtkm::io::writer::VTKDataSetWriter writer("scalar.vtk");
+  vtkm::io::VTKDataSetWriter writer("scalar.vtk");
   writer.WriteDataSet(result);
 }
 
diff --git a/vtkm/worklet/testing/UnitTestExternalFaces.cxx b/vtkm/worklet/testing/UnitTestExternalFaces.cxx
index f0e68c966..8911eb89e 100644
--- a/vtkm/worklet/testing/UnitTestExternalFaces.cxx
+++ b/vtkm/worklet/testing/UnitTestExternalFaces.cxx
@@ -14,7 +14,6 @@
 
 #include <vtkm/cont/testing/MakeTestDataSet.h>
 #include <vtkm/cont/testing/Testing.h>
-#include <vtkm/io/writer/VTKDataSetWriter.h>
 
 #include <vtkm/worklet/ExternalFaces.h>
 
@@ -115,9 +114,6 @@ void TestExternalFaces2()
   vtkm::cont::testing::MakeTestDataSet dataSetMaker;
   vtkm::cont::DataSet inDataSet = dataSetMaker.Make3DExplicitDataSet5();
 
-  //  vtkm::io::writer::VTKDataSetWriter writer("vtkm_explicit_data_5.vtk");
-  //  writer.WriteDataSet(inDataSet);
-
   // Expected faces
   const vtkm::IdComponent MAX_POINTS_PER_FACE = 4;
   const vtkm::Id NUM_FACES = 12;
diff --git a/vtkm/worklet/testing/UnitTestStreamSurface.cxx b/vtkm/worklet/testing/UnitTestStreamSurface.cxx
index 1a51b0070..23f611794 100644
--- a/vtkm/worklet/testing/UnitTestStreamSurface.cxx
+++ b/vtkm/worklet/testing/UnitTestStreamSurface.cxx
@@ -10,7 +10,7 @@
 
 #include <vtkm/cont/DataSetBuilderExplicit.h>
 #include <vtkm/cont/testing/Testing.h>
-#include <vtkm/io/writer/VTKDataSetWriter.h>
+#include <vtkm/io/VTKDataSetWriter.h>
 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/StreamSurface.h>
 
@@ -62,13 +62,6 @@ void TestSameNumPolylines()
                    "Wrong number of points in StreamSurface worklet");
   VTKM_TEST_ASSERT(newCells.GetNumberOfCells() == 12,
                    "Wrong number of cells in StreamSurface worklet");
-  /*
-  vtkm::cont::DataSet ds2;
-  ds2.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coords", newPoints));
-  ds2.SetCellSet(newCells);
-  vtkm::io::writer::VTKDataSetWriter writer("srf.vtk");
-  writer.WriteDataSet(ds2);
-*/
 }
 
 void TestUnequalNumPolylines(int unequalType)
@@ -129,14 +122,6 @@ void TestUnequalNumPolylines(int unequalType)
                    "Wrong number of points in StreamSurface worklet");
   VTKM_TEST_ASSERT(newCells.GetNumberOfCells() == numRequiredCells,
                    "Wrong number of cells in StreamSurface worklet");
-
-  /*
-  vtkm::cont::DataSet ds2;
-  ds2.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coords", newPoints));
-  ds2.SetCellSet(newCells);
-  vtkm::io::writer::VTKDataSetWriter writer("srf.vtk");
-  writer.WriteDataSet(ds2);
-*/
 }
 
 void TestStreamSurface()
diff --git a/vtkm/worklet/testing/UnitTestTemporalAdvection.cxx b/vtkm/worklet/testing/UnitTestTemporalAdvection.cxx
index 889b043e7..28d54c064 100644
--- a/vtkm/worklet/testing/UnitTestTemporalAdvection.cxx
+++ b/vtkm/worklet/testing/UnitTestTemporalAdvection.cxx
@@ -21,8 +21,6 @@
 #include <vtkm/worklet/particleadvection/Particles.h>
 #include <vtkm/worklet/particleadvection/TemporalGridEvaluators.h>
 
-#include <vtkm/io/writer/VTKDataSetWriter.h>
-
 template <typename ScalarType>
 vtkm::cont::DataSet CreateUniformDataSet(const vtkm::Bounds& bounds, const vtkm::Id3& dims)
 {
diff --git a/vtkm/worklet/testing/UnitTestTube.cxx b/vtkm/worklet/testing/UnitTestTube.cxx
index d091a6fa2..11c2ef1c3 100644
--- a/vtkm/worklet/testing/UnitTestTube.cxx
+++ b/vtkm/worklet/testing/UnitTestTube.cxx
@@ -10,7 +10,6 @@
 
 #include <vtkm/cont/DataSetBuilderExplicit.h>
 #include <vtkm/cont/testing/Testing.h>
-#include <vtkm/io/writer/VTKDataSetWriter.h>
 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/Tube.h>