diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/renderer/spi/ErrorDataSetRendererTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/renderer/spi/ErrorDataSetRendererTests.java
index 29aa1971c..3951f7dbe 100644
--- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/renderer/spi/ErrorDataSetRendererTests.java
+++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/renderer/spi/ErrorDataSetRendererTests.java
@@ -5,6 +5,7 @@
 
 import java.util.Collections;
 
+import io.fair_acc.chartfx.ui.utils.TestFx;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
@@ -74,13 +75,20 @@ public void start(Stage stage) {
     @EnumSource(LineStyle.class)
     public void testRendererNominal(final LineStyle lineStyle) throws Exception {
         for (ErrorStyle eStyle : ErrorStyle.values()) {
-            renderer.setErrorType(eStyle);
-            testRenderer(lineStyle);
+            FXUtils.runAndWait(() -> {
+                renderer.setErrorType(eStyle);
+                try {
+                    testRenderer(lineStyle);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
         }
     }
 
     @Test
-    public void testRendererSepcialCases() throws Exception {
+    @TestFx
+    public void testRendererSpecialCases() throws Exception {
         final LineStyle lineStyle = LineStyle.NORMAL;
 
         renderer.setPointReduction(false);
diff --git a/chartfx-chart/src/test/java/io/fair_acc/chartfx/renderer/spi/LabelledMarkerRendererTests.java b/chartfx-chart/src/test/java/io/fair_acc/chartfx/renderer/spi/LabelledMarkerRendererTests.java
index 5e4105537..03c7a9097 100644
--- a/chartfx-chart/src/test/java/io/fair_acc/chartfx/renderer/spi/LabelledMarkerRendererTests.java
+++ b/chartfx-chart/src/test/java/io/fair_acc/chartfx/renderer/spi/LabelledMarkerRendererTests.java
@@ -74,11 +74,11 @@ public void testSetterGetter() {
         localRenderer.enableHorizontalMarker(true);
         assertTrue(localRenderer.isHorizontalMarker());
 
-        assertNull(localRenderer.getStyle());
+        assertEquals("", localRenderer.getStyle());
         localRenderer.setStyle("arbitrary");
         assertEquals("arbitrary", localRenderer.getStyle());
         localRenderer.setStyle(null);
-        assertNull(localRenderer.getStyle());
+        assertEquals("", localRenderer.getStyle());
     }
 
     @Test