diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index c1c1696..fb5221e 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1679,11 +1679,16 @@
                    "/* */someCall(parameter);", getLLVMStyleWithColumns(15)));
 }
 
-TEST_F(FormatTest, Fuck) {
+TEST_F(FormatTest, FormatStarDependingOnContext) {
   verifyFormat("void f(int *a);");
   verifyFormat("void f() { f(fint * b); }");
 }
 
+TEST_F(FormatTest, SpecialTokensAtEndOfLine) {
+  verifyFormat("while");
+  verifyFormat("operator");
+}
+
 //===----------------------------------------------------------------------===//
 // Objective-C tests.
 //===----------------------------------------------------------------------===//