diff --git a/testing/adios2/bindings/fortran/CMakeLists.txt b/testing/adios2/bindings/fortran/CMakeLists.txt
index 00885a7b98..17d7d24c6c 100644
--- a/testing/adios2/bindings/fortran/CMakeLists.txt
+++ b/testing/adios2/bindings/fortran/CMakeLists.txt
@@ -70,15 +70,8 @@ if(mpi)
   fortran_add_test_helper(BPWriteMemorySelectionRead2D TRUE)
   fortran_add_test_helper(BPWriteMemorySelectionRead3D TRUE)
   fortran_add_test_helper(NullEngine TRUE)
-  
-  if(ADIOS2_HAVE_SZ)
-    fortran_add_test_helper(BPWriteReadSZ2D TRUE)
-    fortran_add_test_helper(BPWriteReadSZ3D TRUE)
-  endif()
-  
-  if(ADIOS2_HAVE_ZFP)
-    fortran_add_test_helper(BPWriteReadZfp2D TRUE)
-  endif()
+
+  add_subdirectory(operation) 
   
   # F2C 
   add_executable(Test.Bindings.Fortran.F2C.BPReadFBlocks
diff --git a/testing/adios2/bindings/fortran/operation/CMakeLists.txt b/testing/adios2/bindings/fortran/operation/CMakeLists.txt
new file mode 100644
index 0000000000..0dfe187afe
--- /dev/null
+++ b/testing/adios2/bindings/fortran/operation/CMakeLists.txt
@@ -0,0 +1,8 @@
+if(ADIOS2_HAVE_SZ)
+  fortran_add_test_helper(BPWriteReadSZ2D TRUE)
+  fortran_add_test_helper(BPWriteReadSZ3D TRUE)
+endif()
+
+if(ADIOS2_HAVE_ZFP)
+  fortran_add_test_helper(BPWriteReadZfp2D TRUE)
+endif()