diff --git a/t/custom_gcode.t b/t/custom_gcode.t
index 69ab8fac8..6c1e1818f 100644
--- a/t/custom_gcode.t
+++ b/t/custom_gcode.t
@@ -36,7 +36,8 @@ use Slic3r::Test;
         1;
     };
     
-    $config->set('layer_gcode', '_MY_CUSTOM_GCODE_');
+    $config->set('start_gcode', '_MY_CUSTOM_START_GCODE_');  # to avoid dealing with the nozzle lift in start G-code
+    $config->set('layer_gcode', '_MY_CUSTOM_LAYER_GCODE_');
     ok $test->(), "custom layer G-code is applied after Z move and before other moves";
 }
 
diff --git a/t/layers.t b/t/layers.t
index 06688b336..d49938f4f 100644
--- a/t/layers.t
+++ b/t/layers.t
@@ -42,6 +42,7 @@ my $test = sub {
     1;
 };
 
+$config->set('start_gcode',             '');  # to avoid dealing with the nozzle lift in start G-code
 $config->set('layer_height', 0.3);
 $config->set('first_layer_height', 0.2);
 ok $test->(), "absolute first layer height";
diff --git a/t/retraction.t b/t/retraction.t
index 9918546b2..3b90dfda7 100644
--- a/t/retraction.t
+++ b/t/retraction.t
@@ -87,6 +87,7 @@ my $test = sub {
     1;
 };
 
+$config->set('start_gcode',             '');  # to avoid dealing with the nozzle lift in start G-code
 $config->set('retract_length',          [1.5]);
 $config->set('retract_before_travel',   [3]);
 $config->set('only_retract_when_crossing_perimeters', 0);