diff --git a/testing/adios2/engine/adios1/TestADIOS1WriteRead.cpp b/testing/adios2/engine/adios1/TestADIOS1WriteRead.cpp
index 54c4da54ab6866c4a91212bb5f88c8592fc556df..ce2076a9928fb8b94274cbdd789ef7409c3b48d3 100644
--- a/testing/adios2/engine/adios1/TestADIOS1WriteRead.cpp
+++ b/testing/adios2/engine/adios1/TestADIOS1WriteRead.cpp
@@ -8,8 +8,8 @@
 #include <iostream>
 #include <stdexcept>
 
-#include <adios2.h>
 #include <adios.h>
+#include <adios2.h>
 #include <adios_read.h>
 
 #include <gtest/gtest.h>
@@ -101,12 +101,12 @@ TEST_F(ADIOS1WriteReadTest, ADIOS2ADIOS1WriteADIOS1Read1D8)
         adios_finalize(0);
     }
 
-    // Read test data using ADIOS1
+// Read test data using ADIOS1
 #ifdef ADIOS2_HAVE_MPI
     // Read everything from rank 0
     int rank;
     MPI_Comm_rank();
-    if(rank == 0)
+    if (rank == 0)
 #endif
     {
         adios_read_init_method(ADIOS_READ_METHOD_BP, MPI_COMM_WORLD,
@@ -328,12 +328,12 @@ TEST_F(ADIOS1WriteReadTest, ADIOS2ADIOS1WriteADIOS1Read2D2x4)
         adios_finalize(0);
     }
 
-    // Read test data using ADIOS1
+// Read test data using ADIOS1
 #ifdef ADIOS2_HAVE_MPI
     // Read everything from rank 0
     int rank;
     MPI_Comm_rank();
-    if(rank == 0)
+    if (rank == 0)
 #endif
     {
         adios_read_init_method(ADIOS_READ_METHOD_BP, MPI_COMM_WORLD,
@@ -565,12 +565,12 @@ TEST_F(ADIOS1WriteReadTest, ADIOS2ADIOS1WriteADIOS1Read2D4x2)
         adios_finalize(0);
     }
 
-    // Read test data using ADIOS1
+// Read test data using ADIOS1
 #ifdef ADIOS2_HAVE_MPI
     // Read everything from rank 0
     int rank;
     MPI_Comm_rank();
-    if(rank == 0)
+    if (rank == 0)
 #endif
     {
         adios_read_init_method(ADIOS_READ_METHOD_BP, MPI_COMM_WORLD,
diff --git a/testing/adios2/engine/bp/TestBPWriteRead.cpp b/testing/adios2/engine/bp/TestBPWriteRead.cpp
index 5133f9faf9b49b5f3171c0cf01fa5dc46773e45f..2096a119efed09dc072f7e225686c6a21d41ca25 100644
--- a/testing/adios2/engine/bp/TestBPWriteRead.cpp
+++ b/testing/adios2/engine/bp/TestBPWriteRead.cpp
@@ -96,12 +96,12 @@ TEST_F(BPWriteReadTest, ADIOS2BPWriteADIOS1Read1D8)
         engine->Close();
     }
 
-    // Read test data using ADIOS1
+// Read test data using ADIOS1
 #ifdef ADIOS2_HAVE_MPI
     // Read everything from rank 0
     int rank;
     MPI_Comm_rank();
-    if(rank == 0)
+    if (rank == 0)
 #endif
     {
         adios_read_init_method(ADIOS_READ_METHOD_BP, MPI_COMM_WORLD,
@@ -310,12 +310,12 @@ TEST_F(BPWriteReadTest, ADIOS2BPWriteADIOS1Read2D2x4)
         engine->Close();
     }
 
-    // Read test data using ADIOS1
+// Read test data using ADIOS1
 #ifdef ADIOS2_HAVE_MPI
     // Read everything from rank 0
     int rank;
     MPI_Comm_rank();
-    if(rank == 0)
+    if (rank == 0)
 #endif
     {
         adios_read_init_method(ADIOS_READ_METHOD_BP, MPI_COMM_WORLD,
@@ -534,12 +534,12 @@ TEST_F(BPWriteReadTest, ADIOS2BPWriteADIOS1Read2D4x2)
         engine->Close();
     }
 
-    // Read test data using ADIOS1
+// Read test data using ADIOS1
 #ifdef ADIOS2_HAVE_MPI
     // Read everything from rank 0
     int rank;
     MPI_Comm_rank();
-    if(rank == 0)
+    if (rank == 0)
 #endif
     {
         adios_read_init_method(ADIOS_READ_METHOD_BP, MPI_COMM_WORLD,