diff --git a/c/common/test/rules/functionnoreturnattributecondition/test.c b/c/common/test/rules/functionnoreturnattributecondition/test.c
index 8299c0cc89..1b0ba759e1 100644
--- a/c/common/test/rules/functionnoreturnattributecondition/test.c
+++ b/c/common/test/rules/functionnoreturnattributecondition/test.c
@@ -1,6 +1,6 @@
+#include "setjmp.h"
 #include "stdlib.h"
 #include "threads.h"
-#include "setjmp.h"
 
 _Noreturn void test_noreturn_f1(int i) { // COMPLIANT
   abort();
@@ -61,20 +61,25 @@ _Noreturn void test_noreturn_f9(int i) { // COMPLIANT
 }
 
 _Noreturn void test_noreturn_f10(int i) { // COMPLIANT
-  switch(i) {
-    case 0:
-      abort(); break;
-    case 1:
-      exit(0); break;
-    case 2:
-      _Exit(0); break;
-    case 3:
-      quick_exit(0); break;
-    case 4:
-      thrd_exit(0); break;
-    default:
-      jmp_buf jb;
-      longjmp(jb, 0);
+  switch (i) {
+  case 0:
+    abort();
+    break;
+  case 1:
+    exit(0);
+    break;
+  case 2:
+    _Exit(0);
+    break;
+  case 3:
+    quick_exit(0);
+    break;
+  case 4:
+    thrd_exit(0);
+    break;
+  default:
+    jmp_buf jb;
+    longjmp(jb, 0);
   }
 }
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll b/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
index e2c210282b..bb54a31df6 100644
--- a/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
@@ -29,5 +29,6 @@ query predicate problems(NoreturnFunction f, string message) {
   mayReturn(f) and
   not f.isCompilerGenerated() and
   message =
-    "The function " + f.getName() + " declared with attribute " + describeNoreturn(f) + " returns a value."
+    "The function " + f.getName() + " declared with attribute " + describeNoreturn(f) +
+      " returns a value."
 }