diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp
index f96128b91710ca3aaefa3e462d9a4f4be6066ce0..0cc5e25faf6bf6bb0711d843a62b029289fbe9ce 100644
--- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp
+++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp
@@ -104,9 +104,7 @@ void ClangAssistProposalItem::applyContextualContent(TextEditor::TextEditorWidge
         }
     } else if (ccr.completionKind() == CodeCompletion::KeywordCompletionKind) {
         CompletionChunksToTextConverter converter;
-        converter.setAddPlaceHolderPositions(true);
-        converter.setAddSpaces(true);
-        converter.setAddExtraVerticalSpaceBetweenBraces(true);
+        converter.setupForKeywords();
 
         converter.parseChunks(ccr.chunks());
 
diff --git a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
index 93a004a1ea40228234b1d0a415514243729975f9..ec733c87d712fb46fb36c6c4f1e658d6e4a6b89c 100644
--- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
@@ -96,6 +96,13 @@ void CompletionChunksToTextConverter::setPlaceHolderToEmphasize(int placeHolderN
     m_placeHolderPositionToEmphasize = placeHolderNumber;
 }
 
+void CompletionChunksToTextConverter::setupForKeywords()
+{
+    setAddPlaceHolderPositions(true);
+    setAddSpaces(true);
+    setAddExtraVerticalSpaceBetweenBraces(true);
+}
+
 const QString &CompletionChunksToTextConverter::text() const
 {
     return m_text;
diff --git a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h
index e84e0dd84fc4d11f4b199497aa7d8a0b10cc5a38..fec927eb446fa3c59ec577f248f44495c527cd93 100644
--- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h
+++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h
@@ -56,6 +56,8 @@ public:
     void setAddOptional(bool addOptional);
     void setPlaceHolderToEmphasize(int placeHolderNumber);
 
+    void setupForKeywords();
+
     const QString &text() const;
     const std::vector<int> &placeholderPositions() const;
     bool hasPlaceholderPositions() const;
diff --git a/tests/unit/unittest/completionchunkstotextconvertertest.cpp b/tests/unit/unittest/completionchunkstotextconvertertest.cpp
index 42ec87768a094312768c1e645c91620e48c95bc7..175da498e4e713e16aa216100a5c0622b4e82b50 100644
--- a/tests/unit/unittest/completionchunkstotextconvertertest.cpp
+++ b/tests/unit/unittest/completionchunkstotextconvertertest.cpp
@@ -269,7 +269,7 @@ TEST_F(CompletionChunksToTextConverter, Switch)
                                            leftBrace,
                                            verticalSpace,
                                            rightBrace});
-    setupConverterForKeywords();
+    converter.setupForKeywords();
 
     converter.parseChunks(completionChunks);
 
@@ -292,7 +292,7 @@ TEST_F(CompletionChunksToTextConverter, For)
                                                    statements,
                                                    verticalSpace,
                                                    rightBrace});
-    setupConverterForKeywords();
+    converter.setupForKeywords();
 
     converter.parseChunks(completionChunks);
 
@@ -306,7 +306,7 @@ TEST_F(CompletionChunksToTextConverter, const_cast)
                                                    rightAngle,
                                                    leftParen,
                                                    rightParen});
-    setupConverterForKeywords();
+    converter.setupForKeywords();
 
     converter.parseChunks(completionChunks);
 
@@ -333,7 +333,7 @@ TEST_F(CompletionChunksToTextConverter, ElseIf)
                                                    statements,
                                                    verticalSpace,
                                                    rightBrace});
-    setupConverterForKeywords();
+    converter.setupForKeywords();
 
     converter.parseChunks(completionChunks);
 
@@ -348,17 +348,11 @@ TEST_F(CompletionChunksToTextConverter, EnableIfT)
                                            optionalComma,
                                            optionalEnableIfTType,
                                            rightAngle});
-    setupConverterForKeywords();
+    converter.setupForKeywords();
 
     converter.parseChunks(completionChunks);
 
     ASSERT_THAT(converter.text(), QStringLiteral("enable_if_t&lt;&gt;"));
 }
 
-void CompletionChunksToTextConverter::setupConverterForKeywords()
-{
-    converter.setAddPlaceHolderPositions(true);
-    converter.setAddSpaces(true);
-    converter.setAddExtraVerticalSpaceBetweenBraces(true);
-}
 }