diff --git a/tests/src/mocks/generation/CleanUp_openGL_mock.py b/tests/src/mocks/generation/CleanUp_openGL_mock.py
index a0a5a8c5d1da7d612b51022e8638dcc3dad4b31a..427333961c08713d83ad2672a983f4957d25f912 100644
--- a/tests/src/mocks/generation/CleanUp_openGL_mock.py
+++ b/tests/src/mocks/generation/CleanUp_openGL_mock.py
@@ -21,13 +21,14 @@
 #------------------------------------------------------------------------------
 import textwrap
 import os
+from collections import defaultdict
 
 params_to_be_sorted = ["functions_to_mock", "allow_calls_provided", 
 					   "gl_types"]
 
 def sortListAlphabetically(content):
 	prefix = content[0:content.find("=")]
-	print("... sorting prefix " + prefix)
+	print("... sorting " + prefix)
 	
 	sub_content = content[content.find("[")+1:content.find("']")]
 	params = sub_content.split("',")
@@ -36,9 +37,23 @@ def sortListAlphabetically(content):
 	#else:
 	params = sorted(params)
 	
-	sub_content = ', '.join(str(val)+"'" for val in params)
+	if (params_to_be_sorted[1] in prefix):
+		sub_content = SortGlewBeforeGl(params)
+	else:
+		sub_content = ', '.join(str(val)+"'" for val in params)
+	
 	return (prefix+ " = [" + sub_content+"]")
 
+
+def SortGlewBeforeGl(params):
+	d = defaultdict(list)
+	for val in params:
+		d["glew" in val].append(val)
+	sortedParams = ', '.join(str(p)+"'" for p in d[True])
+	sortedParams += ','
+	sortedParams += ','.join(str(p)+"'" for p in d[False])
+	return sortedParams
+
 	
 def printToFile(file, content):
 	nr_of_blanks = len(content[0:content.find("[")+1])
@@ -57,7 +72,7 @@ def printWithLineBreakAtComma(file, content, nr_of_blanks):
 	content = content.replace ("',", "',\n")
 	params = content.split("\n")
 	for val in params:
-		file.write(val+"\n" if val == params[0] else ' '*(nr_of_blanks-1)+val+"\n")
+		file.write(val+"\n" if val == params[0] else ' '*(nr_of_blanks)+val+"\n")
 
 		
 def main():