diff --git a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
index 6c91cb0a32038bd0d61bb962a6d116d2c74691a0..184c94f596f3a186a46ae8035f48e0aa356593eb 100644
--- a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
+++ b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
@@ -50,18 +50,18 @@ atlas_install_scripts( test/*.sh test/ref.* test/*.py )
 atlas_add_test( test_athena_ntuple_dumper_multiple
                 SCRIPT test/test_athena_ntuple_dumper_multiple.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )
 
 
 atlas_add_test( test_athena_ntuple_dumper_varhandles_nooutput
                 SCRIPT test/test_athena_ntuple_dumper_varhandles_nooutput.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )
 
 atlas_add_test( test_athena_ntuple_dumper_varhandles
                 SCRIPT test/test_athena_ntuple_dumper_varhandles.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )
 
 atlas_add_test( test_athena_ntuple_dumper_novarhandles
                 SCRIPT test/test_athena_ntuple_dumper_novarhandles.sh
@@ -71,17 +71,17 @@ atlas_add_test( test_athena_ntuple_dumper_novarhandles
 atlas_add_test( test_athena_variable_shape1
                 SCRIPT test/test_athena_variable_shape1.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )
 
 atlas_add_test( test_athena_variable_shape2
                 SCRIPT test/test_athena_variable_shape2.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )
 
 atlas_add_test( test_athena_variable_shape3
                 SCRIPT test/test_athena_variable_shape3.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/test/test_athena_variable_shape_merged.sh.in
                 ${CMAKE_CURRENT_BINARY_DIR}/test_athena_variable_shape_merged_script.sh
@@ -89,7 +89,7 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/test/test_athena_variable_shape_merg
 atlas_add_test( test_athena_variable_shape_merged
                 SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/test_athena_variable_shape_merged_script.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )
 set_tests_properties( AthenaRootComps_test_athena_variable_shape_merged_ctest
                       PROPERTIES DEPENDS
                       "AthenaRootComps_test_athena_variable_shape1_ctest;AthenaRootComps_test_athena_variable_shape2_ctest;AthenaRootComps_test_athena_variable_shape3_ctest" )
@@ -97,10 +97,10 @@ set_tests_properties( AthenaRootComps_test_athena_variable_shape_merged_ctest
 atlas_add_test( test_athena_multtuple
                 SCRIPT test/test_athena_multtuple.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )
                     
 atlas_add_test( test_athena_multtuple_seek
                 SCRIPT test/test_athena_multtuple_seek.sh
                 EXTRA_PATTERNS ".*"
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 600 )