diff --git a/Control/AthenaConfiguration/CMakeLists.txt b/Control/AthenaConfiguration/CMakeLists.txt
index cc4d51aa02ea0b0b4c7f31c56a0b6524c8a4134f..3ce9208d39b22e5bb65c6dcda8df3ba7e1bed3a5 100644
--- a/Control/AthenaConfiguration/CMakeLists.txt
+++ b/Control/AthenaConfiguration/CMakeLists.txt
@@ -30,7 +30,7 @@ atlas_add_test( AthConfigFlagsTest
 atlas_add_test( GenerateBootstrapTest
    SCRIPT test/test_gen_bootstrap.sh
    #ignore location of bootstrap file and whether it was already downloaded
-   EXTRA_PATTERNS ".*\/share\/bootstrap*pkl|File.*exists in the current directory"
+   EXTRA_PATTERNS ".*copy bootstrap.*pkl|.*\/share\/bootstrap.*pkl|File.*exists in the current directory|^Willing to acquire"
    )
 
 if( NOT "${CMAKE_PROJECT_NAME}" STREQUAL "AthSimulation" )
diff --git a/Control/AthenaConfiguration/test/test_gen_bootstrap.sh b/Control/AthenaConfiguration/test/test_gen_bootstrap.sh
index 9a1e5e985a90cfdda0bd26c3a56398b43df5b0a2..91b44912873097ba54d71543b180d933a617e6a8 100755
--- a/Control/AthenaConfiguration/test/test_gen_bootstrap.sh
+++ b/Control/AthenaConfiguration/test/test_gen_bootstrap.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #Generate threaded and serial bootstrap pickles and diff them
 #If there's a major change in AthenaCommon or Gaudi it will get picked up here
-
+rm bootstrap*pkl
 athena --config-only=bootstrap_test.pkl AthenaConfiguration/zeroJO.py &> /dev/null
 get_files -remove -data bootstrap.pkl
 confTool.py --diff bootstrap.pkl bootstrap_test.pkl | grep -v identical