diff --git a/Tools/ardupilotwaf/gtest.py b/Tools/ardupilotwaf/gtest.py
index 5272a87277..2fbf781b10 100644
--- a/Tools/ardupilotwaf/gtest.py
+++ b/Tools/ardupilotwaf/gtest.py
@@ -42,10 +42,10 @@ def configure(cfg):
 def libgtest(bld, **kw):
     kw['cxxflags'] = Utils.to_list(kw.get('cxxflags', [])) + ['-Wno-undef']
     kw.update(
-        source='modules/gtest/src/gtest-all.cc',
+        source='modules/gtest/googletest/src/gtest-all.cc',
         target='gtest/gtest',
-        includes='modules/gtest/ modules/gtest/include',
-        export_includes='modules/gtest/include',
+        includes='modules/gtest/googletest modules/gtest/googletest/include',
+        export_includes='modules/gtest/googletest/include',
         name='GTEST',
     )
     return bld.stlib(**kw)