diff --git a/cfg/googletest.cfg b/cfg/googletest.cfg
index 36dd8a40669..c32eef7274b 100644
--- a/cfg/googletest.cfg
+++ b/cfg/googletest.cfg
@@ -29,11 +29,11 @@
   <define name="EXPECT_THROW(code, e)" value="try{code;}catch(e){}"/>
   <define name="ASSERT_NO_THROW(code)" value="code"/>
   <define name="EXPECT_NO_THROW(code)" value="code"/>
-  <define name="TEST(A,B)" value="void __ ## A ## _ ## B ( )"/>
-  <define name="TEST_F(A,B)" value="void __ ## A ## _ ## B ( )"/>
-  <define name="TEST_P(A,B)" value="void __ ## A ## _ ## B ( )"/>
-  <define name="TYPED_TEST(A,B)" value="void __ ## A ## _ ## B ( )"/>
-  <define name="TYPED_TEST_P(A,B)" value="void __ ## A ## _ ## B ( )"/>
+  <define name="TEST(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
+  <define name="TEST_F(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
+  <define name="TEST_P(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
+  <define name="TYPED_TEST(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
+  <define name="TYPED_TEST_P(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
   <define name="GTEST_API_" value=""/>
   <define name="GTEST_FLAG(name)" value="FLAGS_gtest_##name"/>
   <define name="GTEST_DECLARE_bool_(name)" value="GTEST_API_ extern bool GTEST_FLAG(name)"/>