diff --git a/CHANGELOG.md b/CHANGELOG.md
index bde3067f9929..0a0a4489f9c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Enable GCM run test in CircleCI (1-hour, no ExtData)
 - Added monotonic regridding option
 - Make availalbe to History and ExtData2G all supported regridding methods
+- Fix bundleio tests
 
 ### Changed
 
diff --git a/base/tests/CMakeLists.txt b/base/tests/CMakeLists.txt
index 9e300e6d8357..83ac2cf7e2eb 100644
--- a/base/tests/CMakeLists.txt
+++ b/base/tests/CMakeLists.txt
@@ -53,10 +53,10 @@ ecbuild_add_executable (
 set_target_properties(${TESTIO} PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY})
 
 add_test(NAME bundleio_tests_latlon
-  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${TESTIO} -nx 2 -ny 1 -ogrid PC90x47-DE)
+  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${TESTIO} -nx 2 -ny 1 -ogrid PC90x47-DE -o file1_ll.nc4)
 
 add_test(NAME bundleio_tests_cube
-  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 6 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${TESTIO} -nx 1 -ny 6 -ogrid PE12x72-CF)
+  COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 6 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${TESTIO} -nx 1 -ny 6 -ogrid PE12x72-CF -o file_cs.nc4)
 
 add_dependencies(build-tests ${TESTIO})
 
diff --git a/base/tests/mapl_bundleio_test.F90 b/base/tests/mapl_bundleio_test.F90
index 771cc49f38d7..87e9e6c5c9de 100644
--- a/base/tests/mapl_bundleio_test.F90
+++ b/base/tests/mapl_bundleio_test.F90
@@ -97,6 +97,8 @@ subroutine main()
       case('-ny')
          call get_command_argument(i+1,astr)
          read(astr,*)ny
+      case('-o')
+         call get_command_argument(i+1,filename)
       end select
     enddo
 
@@ -157,7 +159,6 @@ subroutine main()
     call MAPL_FieldBundleAdd(bundle,field,__RC__)
 
 
-    filename="temp_file.nc4"
     call newWriter%create_from_bundle(bundle,clock,filename,rc=status)
     _VERIFY(status)
     call newWriter%write_to_file(rc=status)