diff --git a/AtlasTest/TestTools/share/post.sh b/AtlasTest/TestTools/share/post.sh
index 426541c251fab90da542179244f694ef2ae84d60..71a10cc92ea5a60e7bdd75111b239c210ee59734 100755
--- a/AtlasTest/TestTools/share/post.sh
+++ b/AtlasTest/TestTools/share/post.sh
@@ -164,6 +164,7 @@ PP="$PP"'|servers found for host'
 PP="$PP"'|^(Sun|Mon|Tue|Wed|Thu|Fri|Sat) '
 PP="$PP"'|INFO Database being retired|^Domain.*INFO'
 PP="$PP"'|SZ='
+PP="$PP"'|using job opts'
 
 # Outputs dependent on whether or not a file catalog already exists.
 PP="$PP"'|XMLFileCatalog|File is not in Catalog|Failed to open container to check POOL collection|Open     DbSession|Access   DbDomain|Access   DbDatabase|^RootDatabase.open|Deaccess DbDatabase'
diff --git a/AtlasTest/TestTools/src/initGaudi.cxx b/AtlasTest/TestTools/src/initGaudi.cxx
index bc58fa6ee8e5600ae084da3b7e9943cbb10ca1d1..630e662261a4057465082c8eda4c2bd35efcb555 100644
--- a/AtlasTest/TestTools/src/initGaudi.cxx
+++ b/AtlasTest/TestTools/src/initGaudi.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -33,6 +33,23 @@ namespace Athena_test {
     string jobOptsPath = jobOptsFile;
     if (access (jobOptsPath.c_str(), R_OK) != 0)
       jobOptsPath = "../share/"+jobOptsFile;
+    if (access (jobOptsPath.c_str(), R_OK) != 0) {
+      const char* jopath = getenv ("JOBOPTSEARCHPATH");
+      if (jopath) {
+        char* savepath = new char[strlen(jopath)+1];
+        strcpy (savepath, jopath);
+        char* saveptr = nullptr;
+        char* str = savepath;
+        while (char* tok = strtok_r (str, ":", &saveptr)) {
+          str = nullptr;
+          jobOptsPath = std::string(tok) + "/" + jobOptsFile;
+          if (access (jobOptsPath.c_str(), R_OK) == 0) {
+            break;
+          }
+        }
+        delete [] savepath;
+      }
+    }
     bool noJobOpts(jobOptsFile.empty());
     if (!noJobOpts) {
       cout << "\n\nInitializing Gaudi ApplicationMgr using job opts " << jobOptsPath << endl;