diff --git a/AtlasTest/TestTools/CMakeLists.txt b/AtlasTest/TestTools/CMakeLists.txt
index 092a55d876cbe03c8aff1b058baeac0b0cc2fb12..4345698b7b006fc0799b4b22aab2ab0ef5d37304 100644
--- a/AtlasTest/TestTools/CMakeLists.txt
+++ b/AtlasTest/TestTools/CMakeLists.txt
@@ -1,3 +1,4 @@
+# $Id: CMakeLists.txt 744649 2016-05-03 19:33:39Z krasznaa $
 ################################################################################
 # Package: TestTools
 ################################################################################
@@ -6,25 +7,28 @@
 atlas_subdir( TestTools )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaCommon
-                          TestPolicy
-                          PRIVATE
-                          GaudiKernel )
+atlas_depends_on_subdirs(
+   PUBLIC
+   Control/AthenaCommon
+   TestPolicy
+   PRIVATE
+   GaudiKernel )
 
-# External dependencies:
-find_package( PythonLibs )
-
-# Component(s) in the package:
-atlas_add_library( TestTools
-                   src/*.cxx
-                   PUBLIC_HEADERS TestTools
-                   INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${PYTHON_LIBRARIES}
-                   PRIVATE_LINK_LIBRARIES GaudiKernel )
+# In standalone mode we just use the headers from the package. While in
+# offline mode we build a proper library.
+if( XAOD_STANDALONE )
+   atlas_add_library( TestTools
+      TestTools/*.h
+      INTERFACE
+      PUBLIC_HEADERS TestTools )
+else()
+   atlas_add_library( TestTools
+      TestTools/*.h src/*.cxx
+      PUBLIC_HEADERS TestTools
+      PRIVATE_LINK_LIBRARIES GaudiKernel )
+endif()
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_scripts( share/runUnitTests.sh share/post.sh )
-
diff --git a/AtlasTest/TestTools/cmt/requirements b/AtlasTest/TestTools/cmt/requirements
index 8430b1ae826f92f9713c5f9612843bb50d737fd2..c785e43bb64232224ea98fc650b4186fb03d58e5 100644
--- a/AtlasTest/TestTools/cmt/requirements
+++ b/AtlasTest/TestTools/cmt/requirements
@@ -43,4 +43,3 @@ macro_append DOXYGEN_INPUT " ../doc"
 macro_append DOXYGEN_INPUT " ../share" 
 macro_append DOXYGEN_FILE_PATTERNS    " *.sh"
 macro_append DOXYGEN_FILE_PATTERNS    " *.txt"
-
diff --git a/AtlasTest/TestTools/share/post.sh b/AtlasTest/TestTools/share/post.sh
index c70315da53f2694e718091afdf012eeb11028d75..4ea009d7ea35d490730dc7d8a8a5398a42a2c7da 100755
--- a/AtlasTest/TestTools/share/post.sh
+++ b/AtlasTest/TestTools/share/post.sh
@@ -145,6 +145,9 @@ PP="$PP"'|^ConditionStore +INFO Stop ConditionStore'
 # Differences between Gaudi versions.
 PP="$PP"'|DEBUG input handles:|DEBUG output handles:|DEBUG Data Deps for|DEBUG Property update for OutputLevel :|-ExtraInputs |-ExtraOutputs |-Cardinality |-IsClonable |-NeededResources |-Timeline '
 
+# StoreGate INFO messages changed to VERBOSE
+PP="$PP"'|^StoreGateSvc +(INFO|VERBOSE) (Stop|stop|Start)'
+
 
 if [ "$extrapatterns" != "" ]; then
  PP="$PP""|$extrapatterns"