diff --git a/lib/features/modeling/cmd/SetColorHandler.js b/lib/features/modeling/cmd/SetColorHandler.js
index 3e5e2b78c2..aa28269714 100644
--- a/lib/features/modeling/cmd/SetColorHandler.js
+++ b/lib/features/modeling/cmd/SetColorHandler.js
@@ -52,7 +52,7 @@ export default function SetColorHandler(commandStack) {
       }
     }
 
-    throw new Error('invalid color value: ' + color);
+    throw new Error(`invalid color value: ${ color }`);
   };
 }
 
diff --git a/lib/features/modeling/cmd/SplitLaneHandler.js b/lib/features/modeling/cmd/SplitLaneHandler.js
index d3579701be..97b5d9bcf0 100644
--- a/lib/features/modeling/cmd/SplitLaneHandler.js
+++ b/lib/features/modeling/cmd/SplitLaneHandler.js
@@ -41,7 +41,7 @@ SplitLaneHandler.prototype.preExecute = function(context) {
       existingLanesCount = childLanes.length;
 
   if (existingLanesCount > newLanesCount) {
-    throw new Error(`more than <${newLanesCount}> child lanes`);
+    throw new Error(`more than <${ newLanesCount }> child lanes`);
   }
 
   var isHorizontalLane = isHorizontal(shape);
diff --git a/lib/features/ordering/BpmnOrderingProvider.js b/lib/features/ordering/BpmnOrderingProvider.js
index 30059674a7..ff42b5caa8 100644
--- a/lib/features/ordering/BpmnOrderingProvider.js
+++ b/lib/features/ordering/BpmnOrderingProvider.js
@@ -113,7 +113,7 @@ export default function BpmnOrderingProvider(eventBus, canvas) {
     }
 
     if (!order) {
-      throw new Error('no order for <' + element.id + '>');
+      throw new Error(`no order for <${ element.id }>`);
     }
 
     return order;
@@ -133,7 +133,7 @@ export default function BpmnOrderingProvider(eventBus, canvas) {
     }
 
     if (!actualParent) {
-      throw new Error('no parent for <' + element.id + '> in <' + (newParent && newParent.id) + '>');
+      throw new Error(`no parent for <${ element.id }> in <${ newParent && newParent.id }>`);
     }
 
     return actualParent;
diff --git a/rollup.config.js b/rollup.config.js
index 7a0ba30cc1..aa3e57234c 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -131,7 +131,7 @@ function processTemplate(str, args) {
     var replacement = args[n];
 
     if (!replacement) {
-      throw new Error('unknown template {{ ' + n + '}}');
+      throw new Error(`unknown template {{ ${ n } }}`);
     }
 
     return replacement;
diff --git a/test/spec/features/ordering/Helper.js b/test/spec/features/ordering/Helper.js
index 3094221b68..f45bd81c1c 100644
--- a/test/spec/features/ordering/Helper.js
+++ b/test/spec/features/ordering/Helper.js
@@ -206,7 +206,7 @@ export function expectZOrder() {
 
     if (next && compareZOrder(e, next) !== -1) {
       throw new Error(
-        'expected <element#' + (next.id || next) + '> to be in front of <element#' + (e.id || e) + '>'
+        `expected <element#${ next.id || next }> to be in front of <element#${ e.id || e }>`
       );
     }
   });