diff --git a/scripts/generate_test_code.py b/scripts/generate_test_code.py
index 5f711bfb1..6a69f9d3d 100755
--- a/scripts/generate_test_code.py
+++ b/scripts/generate_test_code.py
@@ -328,7 +328,7 @@ def gen_function_wrapper(name, local_vars, args_dispatch):
     """
     # Then create the wrapper
     wrapper = '''
-void {name}_wrapper( void ** params )
+static void {name}_wrapper( void ** params )
 {{
 {unused_params}{locals}
     {name}( {args} );
@@ -651,6 +651,9 @@ def parse_function_code(funcs_f, dependencies, suite_dependencies):
         raise GeneratorInputError("file: %s - Test functions not found!" %
                                   funcs_f.name)
 
+    # Make the test function static
+    code = code.replace('void', 'static void', 1)
+
     # Prefix test function name with 'test_'
     code = code.replace(name, 'test_' + name, 1)
     name = 'test_' + name