diff --git a/l3experimental/l3draw/testfiles/m3draw006.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw006.ptex.tlg
index 64320eb760..19ecdcfce0 100644
--- a/l3experimental/l3draw/testfiles/m3draw006.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw006.ptex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_box_use:N
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -44,6 +48,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -77,6 +85,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -110,6 +122,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -147,6 +163,10 @@ TEST 2: \draw_coffin_use:N
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -187,6 +207,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -227,6 +251,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -267,6 +295,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -307,6 +339,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
diff --git a/l3experimental/l3draw/testfiles/m3draw006.tlg b/l3experimental/l3draw/testfiles/m3draw006.tlg
index 482e57d262..d519fe1cbb 100644
--- a/l3experimental/l3draw/testfiles/m3draw006.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw006.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_box_use:N
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
@@ -43,6 +47,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
@@ -75,6 +83,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
@@ -107,6 +119,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
@@ -143,6 +159,10 @@ TEST 2: \draw_coffin_use:N
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
@@ -182,6 +202,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
@@ -221,6 +245,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
@@ -260,6 +288,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
@@ -299,6 +331,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{283.46457 0 l}
 ...\pdfliteral{141.73228 0 m}
diff --git a/l3experimental/l3draw/testfiles/m3draw006.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw006.uptex.tlg
index 64320eb760..19ecdcfce0 100644
--- a/l3experimental/l3draw/testfiles/m3draw006.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw006.uptex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_box_use:N
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -44,6 +48,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -77,6 +85,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -110,6 +122,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -147,6 +163,10 @@ TEST 2: \draw_coffin_use:N
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -187,6 +207,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -227,6 +251,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -267,6 +295,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -307,6 +339,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
diff --git a/l3experimental/l3draw/testfiles/m3draw006.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw006.xetex.tlg
index 64320eb760..19ecdcfce0 100644
--- a/l3experimental/l3draw/testfiles/m3draw006.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw006.xetex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_box_use:N
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -44,6 +48,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -77,6 +85,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -110,6 +122,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -147,6 +163,10 @@ TEST 2: \draw_coffin_use:N
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -187,6 +207,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -227,6 +251,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -267,6 +295,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}
@@ -307,6 +339,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 283.46457 0 l}
 ...\special{pdf:literal 141.73228 0 m}