diff --git a/gtests/Hlsl.FromFile.cpp b/gtests/Hlsl.FromFile.cpp
index 825179df77f88deea04d7dc47e187a903b25de60..e5922bc103eeba880cf63e61fd4c924204955389 100644
--- a/gtests/Hlsl.FromFile.cpp
+++ b/gtests/Hlsl.FromFile.cpp
@@ -59,7 +59,7 @@ std::string FileNameAsCustomTestSuffix(
 using HlslCompileTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
 
 // Compiling HLSL to SPIR-V under Vulkan semantics. Expected to successfully
-// generate SPIR-V.
+// generate both AST and SPIR-V.
 TEST_P(HlslCompileTest, FromFile)
 {
     loadFileCompileAndCheck(GLSLANG_TEST_DIRECTORY, GetParam().fileName,
diff --git a/gtests/TestFixture.h b/gtests/TestFixture.h
index a13a50b310cc60d7d0626837dcabeb0bbc92bbba..0b389ada73633576629d7ec6f9ae9164698c4779 100644
--- a/gtests/TestFixture.h
+++ b/gtests/TestFixture.h
@@ -129,14 +129,13 @@ public:
     }
 
     // Checks the equality of |expected| and |real|. If they are not equal,
-    // write
-    // |real| to the given file named as |fname| if update mode is on.
+    // write |real| to the given file named as |fname| if update mode is on.
     void checkEqAndUpdateIfRequested(const std::string& expected,
                                      const std::string& real,
                                      const std::string& fname)
     {
-        // In order to output the message we want under proper circumstances, we
-        // need the following operator<< stuff.
+        // In order to output the message we want under proper circumstances,
+        // we need the following operator<< stuff.
         EXPECT_EQ(expected, real)
             << (GlobalTestSettings.updateMode
                     ? ("Mismatch found and update mode turned on - "
@@ -145,10 +144,8 @@ public:
 
         // Update the expected output file if requested.
         // It looks weird to duplicate the comparison between expected_output
-        // and
-        // stream.str(). However, if creating a variable for the comparison
-        // result,
-        // we cannot have pretty print of the string diff in the above.
+        // and stream.str(). However, if creating a variable for the comparison
+        // result, we cannot have pretty print of the string diff in the above.
         if (GlobalTestSettings.updateMode && expected != real) {
             EXPECT_TRUE(WriteFile(fname, real)) << "Flushing failed";
         }
@@ -165,7 +162,7 @@ public:
         const std::string spirv;  // Optional SPIR-V disassembly text.
     };
 
-    // Compiles and linkes the given source |code| of the given shader
+    // Compiles and links the given source |code| of the given shader
     // |stage| into the given |target| under the given |semantics|. Returns
     // a GlslangResult instance containing all the information generated
     // during the process. If |target| is Target::Spirv, also disassembles