diff --git a/src/plugins/autotest/unit_test/simple_gt/tests/common/functions.js b/src/plugins/autotest/unit_test/simple_gt/tests/common/functions.js
index 8ce7f31ad95..89cd648a31e 100644
--- a/src/plugins/autotest/unit_test/simple_gt/tests/common/functions.js
+++ b/src/plugins/autotest/unit_test/simple_gt/tests/common/functions.js
@@ -1,8 +1,8 @@
-var FileInfo = loadExtension("qbs.FileInfo")
+var FileInfo = require("qbs.FileInfo")
 
-function getGTestDir(str) {
+function getGTestDir(Qbs, str) {
     if (!str) {
-        if (qbs.hostOS.contains("linux"))
+        if (Qbs.hostOS.contains("linux"))
             return "/usr/include/gtest";
     } else {
         return FileInfo.joinPaths(str, "googletest");
@@ -10,9 +10,9 @@ function getGTestDir(str) {
     return "";
 }
 
-function getGMockDir(str) {
+function getGMockDir(Qbs, str) {
     if (!str) {
-        if (qbs.hostOS.contains("linux"))
+        if (Qbs.hostOS.contains("linux"))
             return "/usr/include/gmock";
     } else {
         return FileInfo.joinPaths(str, "googlemock");
@@ -20,29 +20,29 @@ function getGMockDir(str) {
     return "";
 }
 
-function getGTestAll(str) {
-    var gtest = getGTestDir(str);
+function getGTestAll(Qbs, str) {
+    var gtest = getGTestDir(Qbs, str);
     if (!gtest)
         return [];
     return [FileInfo.joinPaths(gtest, "src/gtest-all.cc")];
 }
 
-function getGMockAll(str) {
-    var gmock = getGMockDir(str);
+function getGMockAll(Qbs, str) {
+    var gmock = getGMockDir(Qbs, str);
     if (!gmock)
         return [];
     return [FileInfo.joinPaths(gmock, "src/gmock-all.cc")];
 }
 
-function getGTestIncludes(str) {
-    var gtest = getGTestDir(str);
+function getGTestIncludes(Qbs, str) {
+    var gtest = getGTestDir(Qbs, str);
     if (!gtest)
         return [];
     return [gtest, FileInfo.joinPaths(gtest, "include")];
 }
 
-function getGMockIncludes(str) {
-    var mock = getGMockDir(str);
+function getGMockIncludes(Qbs, str) {
+    var mock = getGMockDir(Qbs, str);
     if (!mock)
         return [];
     return [mock, FileInfo.joinPaths(mock, "include")];
diff --git a/src/plugins/autotest/unit_test/simple_gt/tests/gt1/gt1.qbs b/src/plugins/autotest/unit_test/simple_gt/tests/gt1/gt1.qbs
index f560bb41e6a..ac59d83da83 100644
--- a/src/plugins/autotest/unit_test/simple_gt/tests/gt1/gt1.qbs
+++ b/src/plugins/autotest/unit_test/simple_gt/tests/gt1/gt1.qbs
@@ -7,8 +7,8 @@ CppApplication {
     type: "application"
     name: "googletest1"
 
-    property string gtestDir: googleCommon.getGTestDir(project.googletestDir)
-    property string gmockDir: googleCommon.getGMockDir(project.googletestDir)
+    property string gtestDir: googleCommon.getGTestDir(qbs, project.googletestDir)
+    property string gmockDir: googleCommon.getGMockDir(qbs, project.googletestDir)
 
     condition: {
         if (File.exists(gtestDir) && File.exists(gmockDir))
@@ -19,8 +19,8 @@ CppApplication {
         return false;
     }
 
-    cpp.includePaths: [].concat(googleCommon.getGTestIncludes(project.googletestDir))
-                        .concat(googleCommon.getGMockIncludes(project.googletestDir))
+    cpp.includePaths: [].concat(googleCommon.getGTestIncludes(qbs, project.googletestDir))
+                        .concat(googleCommon.getGMockIncludes(qbs, project.googletestDir))
 
     cpp.cxxLanguageVersion: "c++11"
     cpp.defines: ["GTEST_LANG_CXX11"]
@@ -30,6 +30,6 @@ CppApplication {
         // own stuff
         "further.cpp",
         "main.cpp",
-    ].concat(googleCommon.getGTestAll(project.googletestDir))
-     .concat(googleCommon.getGMockAll(project.googletestDir))
+    ].concat(googleCommon.getGTestAll(qbs, project.googletestDir))
+     .concat(googleCommon.getGMockAll(qbs, project.googletestDir))
 }
diff --git a/src/plugins/autotest/unit_test/simple_gt/tests/gt2/gt2.qbs b/src/plugins/autotest/unit_test/simple_gt/tests/gt2/gt2.qbs
index b0a898103f5..98fdc1e4c96 100644
--- a/src/plugins/autotest/unit_test/simple_gt/tests/gt2/gt2.qbs
+++ b/src/plugins/autotest/unit_test/simple_gt/tests/gt2/gt2.qbs
@@ -7,8 +7,8 @@ CppApplication {
     type: "application"
     name: "googletest2"
 
-    property string gtestDir: googleCommon.getGTestDir(project.googletestDir)
-    property string gmockDir: googleCommon.getGMockDir(project.googletestDir)
+    property string gtestDir: googleCommon.getGTestDir(qbs, project.googletestDir)
+    property string gmockDir: googleCommon.getGMockDir(qbs, project.googletestDir)
 
     Depends { name: "Qt.core" }
 
@@ -21,8 +21,8 @@ CppApplication {
         return false;
     }
 
-    cpp.includePaths: [].concat(googleCommon.getGTestIncludes(project.googletestDir))
-                        .concat(googleCommon.getGMockIncludes(project.googletestDir))
+    cpp.includePaths: [].concat(googleCommon.getGTestIncludes(qbs, project.googletestDir))
+                        .concat(googleCommon.getGMockIncludes(qbs, project.googletestDir))
 
     cpp.cxxLanguageVersion: "c++11"
     cpp.defines: ["GTEST_LANG_CXX11"]
@@ -31,6 +31,6 @@ CppApplication {
         // own stuff
         "queuetest.h",
         "main.cpp",
-    ].concat(googleCommon.getGTestAll(project.googletestDir))
-     .concat(googleCommon.getGMockAll(project.googletestDir))
+    ].concat(googleCommon.getGTestAll(qbs, project.googletestDir))
+     .concat(googleCommon.getGMockAll(qbs, project.googletestDir))
 }
diff --git a/src/plugins/autotest/unit_test/simple_gt/tests/gt2/queuetest.h b/src/plugins/autotest/unit_test/simple_gt/tests/gt2/queuetest.h
index 7fb47e8e62e..815db2bab26 100644
--- a/src/plugins/autotest/unit_test/simple_gt/tests/gt2/queuetest.h
+++ b/src/plugins/autotest/unit_test/simple_gt/tests/gt2/queuetest.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include <gtest/gtest.h>
 #include <QQueue>
 
 class QueueTest : public ::testing::Test
diff --git a/src/plugins/autotest/unit_test/simple_gt/tests/gt3/gt3.qbs b/src/plugins/autotest/unit_test/simple_gt/tests/gt3/gt3.qbs
index 2bd250a5880..e41b820594d 100644
--- a/src/plugins/autotest/unit_test/simple_gt/tests/gt3/gt3.qbs
+++ b/src/plugins/autotest/unit_test/simple_gt/tests/gt3/gt3.qbs
@@ -7,8 +7,8 @@ CppApplication {
     type: "application"
     name: "googletest3"
 
-    property string gtestDir: googleCommon.getGTestDir(project.googletestDir)
-    property string gmockDir: googleCommon.getGMockDir(project.googletestDir)
+    property string gtestDir: googleCommon.getGTestDir(qbs, project.googletestDir)
+    property string gmockDir: googleCommon.getGMockDir(qbs, project.googletestDir)
 
     Depends { name: "Qt.core" }
 
@@ -21,8 +21,8 @@ CppApplication {
         return false;
     }
 
-    cpp.includePaths: [].concat(googleCommon.getGTestIncludes(project.googletestDir))
-                        .concat(googleCommon.getGMockIncludes(project.googletestDir))
+    cpp.includePaths: [].concat(googleCommon.getGTestIncludes(qbs, project.googletestDir))
+                        .concat(googleCommon.getGMockIncludes(qbs, project.googletestDir))
 
     cpp.cxxLanguageVersion: "c++11"
     cpp.defines: ["GTEST_LANG_CXX11"]
@@ -31,6 +31,6 @@ CppApplication {
         // own stuff
         "dummytest.h",
         "main.cpp",
-    ].concat(googleCommon.getGTestAll(project.googletestDir))
-     .concat(googleCommon.getGMockAll(project.googletestDir))
+    ].concat(googleCommon.getGTestAll(qbs, project.googletestDir))
+     .concat(googleCommon.getGMockAll(qbs, project.googletestDir))
 }
diff --git a/src/plugins/autotest/unit_test/simple_gt/tests/gt3/main.cpp b/src/plugins/autotest/unit_test/simple_gt/tests/gt3/main.cpp
index 4f048fa177f..a7d85915123 100644
--- a/src/plugins/autotest/unit_test/simple_gt/tests/gt3/main.cpp
+++ b/src/plugins/autotest/unit_test/simple_gt/tests/gt3/main.cpp
@@ -56,8 +56,8 @@ static QMap<const char *, QStringList> testValuesSec = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(First, DummyTest, ::testing::ValuesIn(testValues.keys()));
-INSTANTIATE_TEST_CASE_P(Second, DummyTest, ::testing::ValuesIn(testValuesSec.keys()));
+INSTANTIATE_TEST_SUITE_P(First, DummyTest, ::testing::ValuesIn(testValues.keys()));
+INSTANTIATE_TEST_SUITE_P(Second, DummyTest, ::testing::ValuesIn(testValuesSec.keys()));
 
 TEST_P(DummyTest, Easy)
 {