diff --git a/testing/adios2/engine/adios1/TestADIOS1WriteRead.cpp b/testing/adios2/engine/adios1/TestADIOS1WriteRead.cpp
index f1f38461dc8250b02f850e0c9782cc6feb0ba59c..97479324516168c9cf17f57fda0b00f94ce7a382 100644
--- a/testing/adios2/engine/adios1/TestADIOS1WriteRead.cpp
+++ b/testing/adios2/engine/adios1/TestADIOS1WriteRead.cpp
@@ -1,3 +1,7 @@
+/*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ */
 #include <cstdint>
 
 #include <iostream>
diff --git a/testing/adios2/engine/bp/TestBPWriteRead.cpp b/testing/adios2/engine/bp/TestBPWriteRead.cpp
index f1745cb9c4f90e25ad1220290882cbd6fcc541f3..6f2596bb554ff6f9aa9084ac2ca037cdeacbaa3f 100644
--- a/testing/adios2/engine/bp/TestBPWriteRead.cpp
+++ b/testing/adios2/engine/bp/TestBPWriteRead.cpp
@@ -1,3 +1,7 @@
+/*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ */
 #include <cstdint>
 
 #include <iostream>
@@ -20,7 +24,7 @@ public:
 //******************************************************************************
 // 1D 1x8 test data
 //******************************************************************************
-TEST_F(BPWriteReadTest, ADIOS2ADIOS2WriteADIOS1Read1D8)
+TEST_F(BPWriteReadTest, ADIOS2BPWriteADIOS1Read1D8)
 {
     {
         adios::ADIOS adios(adios::Verbose::WARN, true);
@@ -48,8 +52,7 @@ TEST_F(BPWriteReadTest, ADIOS2ADIOS2WriteADIOS1Read1D8)
         method.SetEngine("BPFileWriter");
         method.AddTransport("File");
 
-        auto engine =
-            adios.Open("ADIOS2ADIOS2WriteADIOS1Read1D8.bp", "w", method);
+        auto engine = adios.Open("ADIOS2BPWriteADIOS1Read1D8.bp", "w", method);
         ASSERT_NE(engine, nullptr);
 
         for (size_t step = 0; step < 3; ++step)
@@ -90,7 +93,7 @@ TEST_F(BPWriteReadTest, ADIOS2ADIOS2WriteADIOS1Read1D8)
 //******************************************************************************
 // 2D 2x4 test data
 //******************************************************************************
-TEST_F(BPWriteReadTest, ADIOS2ADIOS2WriteADIOS1Read2D2x4)
+TEST_F(BPWriteReadTest, ADIOS2BPWriteADIOS1Read2D2x4)
 {
     {
         adios::ADIOS adios(adios::Verbose::WARN, true);
@@ -164,7 +167,7 @@ TEST_F(BPWriteReadTest, ADIOS2ADIOS2WriteADIOS1Read2D2x4)
 //******************************************************************************
 // 2D 4x2 test data
 //******************************************************************************
-TEST_F(BPWriteReadTest, ADIOS2ADIOS2WriteADIOS1Read2D4x2)
+TEST_F(BPWriteReadTest, ADIOS2BPWriteADIOS1Read2D4x2)
 {
     {
         adios::ADIOS adios(adios::Verbose::WARN, true);
diff --git a/testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp b/testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp
index 165dcda09eed71e17a50aa9dc8814a63657b2da8..d2fa8437bc018338b09c39971e9a10ecb5c45dbb 100644
--- a/testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp
+++ b/testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp
@@ -1,3 +1,7 @@
+/*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ */
 #include <cstdint>
 
 #include <iostream>
@@ -20,7 +24,7 @@ public:
 //******************************************************************************
 // 1D 1x8 test data
 //******************************************************************************
-TEST_F(HDF5WriteReadTest, ADIOS2ADIOS2WriteADIOS1Read1D8)
+TEST_F(HDF5WriteReadTest, ADIOS2HDF5WriteHDF5Read1D8)
 {
     {
         adios::ADIOS adios(adios::Verbose::WARN, true);
@@ -48,8 +52,7 @@ TEST_F(HDF5WriteReadTest, ADIOS2ADIOS2WriteADIOS1Read1D8)
         method.SetEngine("HDF5Writer");
         method.AddTransport("File");
 
-        auto engine =
-            adios.Open("ADIOS2ADIOS2WriteADIOS1Read1D8.h5", "w", method);
+        auto engine = adios.Open("ADIOS2HDF5WriteHDF5Read1D8.h5", "w", method);
         ASSERT_NE(engine, nullptr);
 
         for (size_t step = 0; step < 3; ++step)
@@ -90,7 +93,7 @@ TEST_F(HDF5WriteReadTest, ADIOS2ADIOS2WriteADIOS1Read1D8)
 //******************************************************************************
 // 2D 2x4 test data
 //******************************************************************************
-TEST_F(HDF5WriteReadTest, ADIOS2ADIOS2WriteADIOS1Read2D2x4)
+TEST_F(HDF5WriteReadTest, ADIOS2HDF5WriteHDF5Read2D2x4)
 {
     {
         adios::ADIOS adios(adios::Verbose::WARN, true);
@@ -164,7 +167,7 @@ TEST_F(HDF5WriteReadTest, ADIOS2ADIOS2WriteADIOS1Read2D2x4)
 //******************************************************************************
 // 2D 4x2 test data
 //******************************************************************************
-TEST_F(HDF5WriteReadTest, ADIOS2ADIOS2WriteADIOS1Read2D4x2)
+TEST_F(HDF5WriteReadTest, ADIOS2HDF5WriteHDF5Read2D4x2)
 {
     {
         adios::ADIOS adios(adios::Verbose::WARN, true);