diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
index fa555584c2..07e0c113fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
@@ -124,7 +124,7 @@ class CaseConditionStepImpl<T> extends AbstractField<T> implements CaseCondition
         int size = conditions.size();
         for (int i = 0; i < size; i++) {
             if (i > 0) {
-                context.formatSeparator();
+                context.formatNewLine();
             }
 
             context.keyword(" when ")
@@ -134,7 +134,7 @@ class CaseConditionStepImpl<T> extends AbstractField<T> implements CaseCondition
         }
 
         if (otherwise != null) {
-            context.formatSeparator()
+            context.formatNewLine()
                    .keyword(" else ")
                    .sql(otherwise);
         }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
index 7ad3a061f4..69de2c8a38 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
@@ -161,7 +161,7 @@ class CaseWhenStepImpl<V, T> extends AbstractField<T> implements CaseWhenStep<V,
 
                 for (int i = 0; i < size; i++) {
                     if (i > 0) {
-                        context.formatSeparator();
+                        context.formatNewLine();
                     }
 
                     context.keyword(" when ");
@@ -180,7 +180,7 @@ class CaseWhenStepImpl<V, T> extends AbstractField<T> implements CaseWhenStep<V,
 
                 for (int i = 0; i < size; i++) {
                     if (i > 0) {
-                        context.formatSeparator();
+                        context.formatNewLine();
                     }
 
                     context.keyword(" when ");
@@ -194,7 +194,7 @@ class CaseWhenStepImpl<V, T> extends AbstractField<T> implements CaseWhenStep<V,
         }
 
         if (otherwise != null) {
-            context.formatSeparator()
+            context.formatNewLine()
                    .keyword(" else ")
                    .sql(otherwise);
         }