diff --git a/Control/AthenaCommon/AthenaCommonEnvironmentConfig.cmake b/Control/AthenaCommon/AthenaCommonEnvironmentConfig.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..2609c001f6854246efab9046aa73cb6355d86302
--- /dev/null
+++ b/Control/AthenaCommon/AthenaCommonEnvironmentConfig.cmake
@@ -0,0 +1,11 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# This module is used to set up the environment for AthenaCommon.
+#
+
+# Set the environment variable(s):
+set( ATHENACOMMONENVIRONMENT_ENVIRONMENT
+   SET GAUDI_PROPERTY_PARSING_ERROR_DEFAULT_POLICY "Exception" )
+
+# Silently declare the module found:
+set( ATHENACOMMONENVIRONMENT_FOUND TRUE )
diff --git a/Control/AthenaCommon/CMakeLists.txt b/Control/AthenaCommon/CMakeLists.txt
index b85eb17e3ec46267791e641f7a718b520024297f..f087ae817778d50c6f49f0e2eae68e700b69f364 100644
--- a/Control/AthenaCommon/CMakeLists.txt
+++ b/Control/AthenaCommon/CMakeLists.txt
@@ -1,10 +1,13 @@
-################################################################################
-# Package: AthenaCommon
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AthenaCommon )
 
+# Set up specific Athena runtime environment:
+set( AthenaCommonEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+   CACHE PATH "Location of AthenaCommonEnvironmentConfig.cmake" )
+find_package( AthenaCommonEnvironment )
+
 # Install files from the package:
 atlas_install_python_modules( python/*.py python/Utils
                               POST_BUILD_CMD ${ATLAS_FLAKE8} )
@@ -16,6 +19,7 @@ atlas_install_runtime(share/*.pkl)
 # Aliases:
 atlas_add_alias( athena "athena.py" )
 
+# Tests:
 atlas_add_test( AthAppMgrUnitTests SCRIPT test/test_AthAppMgrUnitTests.sh
                 PROPERTIES TIMEOUT 300
                 LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in|built on" )