diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index fd1c2b814..fc80f4709 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -4137,7 +4137,7 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
     }
     Token * tokBracesEnd=NULL;
     if (tokAfterCondition->str()=="{") {
-        // already surounded by braces
+        // already surrounded by braces
         tokBracesEnd=tokAfterCondition->link();
     } else {
         Token * tokEnd = simplifyAddBracesToCommand(tokAfterCondition);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 1d8893be5..b00b08b76 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -236,7 +236,7 @@ private:
         TEST_CASE(varid50); // #3760 - explicit
         TEST_CASE(varid51); // don't set varid for template function
         TEST_CASE(varid52); // Set varid for nested templates
-        TEST_CASE(varid53); // #4172 - Template instanciation: T<&functionName> list[4];
+        TEST_CASE(varid53); // #4172 - Template instantiation: T<&functionName> list[4];
         TEST_CASE(varid_cpp_keywords_in_c_code);
         TEST_CASE(varidFunctionCall1);
         TEST_CASE(varidFunctionCall2);
@@ -3630,7 +3630,7 @@ private:
                       tokenizeDebugListing(code, false, "test.cpp"));
     }
 
-    void varid53() { // #4172 - Template instanciation: T<&functionName> list[4];
+    void varid53() { // #4172 - Template instantiation: T<&functionName> list[4];
         ASSERT_EQUALS("\n\n##file 0\n"
                       "1: A < & f > list@1 [ 4 ] ;\n",
                       tokenizeDebugListing("A<&f> list[4];", false, "test.cpp"));