diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py
index 8f7b74026f4af8e65397b615ef5ed3733bf90953..37a2ae98316639d289569e089cb4adbb103243d6 100644
--- a/tests/system/shared/editor_utils.py
+++ b/tests/system/shared/editor_utils.py
@@ -207,6 +207,7 @@ def getEditorForFileSuffix(curFile):
                          "tcc", "tpp", "t++", "c", "cu", "m", "mm", "hh", "hxx", "h++", "hpp", "hp"]
     qmlEditorSuffixes = ["qml", "qmlproject", "js", "qs", "qtt"]
     proEditorSuffixes = ["pro", "pri", "prf"]
+    glslEditorSuffixes= ["frag", "vert", "fsh", "vsh"]
     suffix = __getFileSuffix__(curFile)
     if suffix in cppEditorSuffixes:
         editor = waitForObject("{type='CppEditor::Internal::CPPEditorWidget' unnamed='1' "
@@ -217,6 +218,9 @@ def getEditorForFileSuffix(curFile):
     elif suffix in proEditorSuffixes:
         editor = waitForObject("{type='Qt4ProjectManager::Internal::ProFileEditorWidget' unnamed='1' "
                                "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}")
+    elif suffix in glslEditorSuffixes:
+        editor = waitForObject("{type='GLSLEditor::GLSLTextEditorWidget' unnamed='1' "
+                               "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}")
     else:
         test.log("Trying PlainTextEditor (file suffix: %s)" % suffix)
         try:
diff --git a/tests/system/suite_general/tst_select_all/test.py b/tests/system/suite_general/tst_select_all/test.py
index fda92a3ccfe2cd099fd15c5dea10889b7c1bd389..e5f89b1b7837316d44c600ba81a7037ba2cbaef5 100644
--- a/tests/system/suite_general/tst_select_all/test.py
+++ b/tests/system/suite_general/tst_select_all/test.py
@@ -11,7 +11,8 @@ def charactersInFile(filename):
 
 def main():
     files = [srcPath + "/creator/README", srcPath + "/creator/qtcreator.pri",
-             srcPath + "/creator/doc/snippets/qml/list-of-transitions.qml"]
+             srcPath + "/creator/doc/snippets/qml/list-of-transitions.qml",
+             srcPath + "/creator/share/qtcreator/glsl/glsl_120.frag"]
     for currentFile in files:
         if not neededFilePresent(currentFile):
             return