diff --git a/build.lua b/build.lua
index caba130..e5d0945 100644
--- a/build.lua
+++ b/build.lua
@@ -35,6 +35,7 @@ specialformats = specialformats or {}
 specialformats["latex"] = specialformats["latex"] or
   {
     luatex     = {binary="luahbtex",format = "lualatex-dev"},
+    luatexmain     = {binary="luahbtex",format = "lualatex"},
     pdftex     = {format = "pdflatex-dev"},
     pdftexmain = {binary="pdftex",format = "pdflatex"},
     xetex      = {format = "xelatex-dev"},
@@ -48,7 +49,7 @@ checkengines = {"pdftex","luatex","pdftexmain"}
 
 -- force once in a while the full run to find wrong saves
 
--- forcecheckruns=true
+forcecheckruns=true
 
 checkconfigs = {
                  "build",
diff --git a/config-luatex.lua b/config-luatex.lua
index 76868fb..0173c34 100644
--- a/config-luatex.lua
+++ b/config-luatex.lua
@@ -1,4 +1,4 @@
 testfiledir  = "testfiles-luatex"
-checkengines = {"luatex"}
+checkengines = {"luatex","luatexmain"}
 stdengine     = "luatex"
-checkruns    = 2
+checkruns    = 3
diff --git a/testfiles-luatex/debug-structures-2.tlg b/testfiles-luatex/debug-structures-2.tlg
index d27db66..7a609af 100644
--- a/testfiles-luatex/debug-structures-2.tlg
+++ b/testfiles-luatex/debug-structures-2.tlg
@@ -4,7 +4,6 @@ tagpdf DEBUG Info: Tagging stopped
 (tagpdf DEBUG)     level: 0 ==> 1, label: hangfrom [on line ...]
 tagpdf DEBUG Info: Tagging restarted
 (tagpdf DEBUG)     level: 1 ==> 0, label: hangfrom [on line ...]
-Package tagpdf Warning: structure with label blub has already been used
 tagpdf DEBUG Info: Tagging stopped
 (tagpdf DEBUG)     level: 0 ==> 1, label: headfoot [on line ...]
 tagpdf DEBUG Info: Tagging restarted
@@ -15,7 +14,6 @@ tagpdf DEBUG Info: Tagging restarted
 (tagpdf DEBUG)     level: 1 ==> 0, label: headfoot [on line ...]
 [1
 ] (debug-structures-2.aux)
-LaTeX Warning: Label(s) may have changed. Rerun to get cross-references right.
 =========================
 The structure 1 contains:
 >  Type  =>  /StructTreeRoot
@@ -69,7 +67,7 @@ The structure 5 contains:
 The structure has the following kids:
 >  Struct 6
 >  Struct 8
->  Struct 10
+>  Struct 11
 >  Struct 12
 =========================
 =========================
@@ -128,7 +126,7 @@ The structure 10 contains:
 >  NS  =>  pdf2
 >  rolemap  =>  {Link}{pdf2}
 >  parentrole  =>  {Link}{pdf2}
->  P  =>  parent structure: 5 = Sect
+>  P  =>  parent structure: 9 = /text
 The structure has the following kids:
 >  MC 5
 >  OBJR reference
@@ -136,11 +134,11 @@ The structure has the following kids:
 =========================
 The structure 11 contains:
 >  Type  =>  /StructElem
->  S  =>  /Span
->  NS  =>  pdf2
+>  S  =>  /Sect
+>  NS  =>  11 0 R 
 >  rolemap  =>  {Span}{pdf2}
 >  parentrole  =>  {Span}{pdf2}
->  P  =>  no parent: stashed
+>  P  =>  parent structure: 5 = Sect
 The structure has the following kids:
 > NONE
 =========================
diff --git a/testfiles-luatex/debug-structures.tlg b/testfiles-luatex/debug-structures.tlg
index dbe3b5d..30e3441 100644
--- a/testfiles-luatex/debug-structures.tlg
+++ b/testfiles-luatex/debug-structures.tlg
@@ -4,7 +4,6 @@ tagpdf DEBUG Info: Tagging stopped
 (tagpdf DEBUG)     level: 0 ==> 1, label: hangfrom [on line ...]
 tagpdf DEBUG Info: Tagging restarted
 (tagpdf DEBUG)     level: 1 ==> 0, label: hangfrom [on line ...]
-Package tagpdf Warning: structure with label blub has already been used
 tagpdf DEBUG Info: Tagging stopped
 (tagpdf DEBUG)     level: 0 ==> 1, label: headfoot [on line ...]
 tagpdf DEBUG Info: Tagging restarted
@@ -15,7 +14,6 @@ tagpdf DEBUG Info: Tagging restarted
 (tagpdf DEBUG)     level: 1 ==> 0, label: headfoot [on line ...]
 [1
 ] (debug-structures.aux)
-LaTeX Warning: Label(s) may have changed. Rerun to get cross-references right.
 =========================
 The structure 1 contains:
 >  Type  =>  /StructTreeRoot
@@ -69,7 +67,7 @@ The structure 5 contains:
 The structure has the following kids:
 >  Struct 6
 >  Struct 8
->  Struct 10
+>  Struct 11
 >  Struct 12
 =========================
 =========================
@@ -127,7 +125,7 @@ The structure 10 contains:
 >  S  =>  /Link
 >  rolemap  =>  {Link}{}
 >  parentrole  =>  {Link}{}
->  P  =>  parent structure: 5 = Sect
+>  P  =>  parent structure: 9 = /text
 >  NS  =>  pdf2
 The structure has the following kids:
 >  MC 5
@@ -136,10 +134,10 @@ The structure has the following kids:
 =========================
 The structure 11 contains:
 >  Type  =>  /StructElem
->  S  =>  /Span
+>  S  =>  /Sect
 >  rolemap  =>  {Span}{}
 >  parentrole  =>  {Span}{}
->  P  =>  no parent: stashed
+>  P  =>  parent structure: 5 = Sect
 >  NS  =>  pdf2
 The structure has the following kids:
 > NONE
diff --git a/testfiles-luatex/test-patch-koma.tlg b/testfiles-luatex/test-patch-koma.tlg
index e939262..e111f76 100644
--- a/testfiles-luatex/test-patch-koma.tlg
+++ b/testfiles-luatex/test-patch-koma.tlg
@@ -459,7 +459,6 @@ Completed box being shipped out [5]
 .\kern655.63496
 .\pdfliteral page <lua data reference ...>
 (test-patch-koma.aux)
-LaTeX Warning: Label(s) may have changed. Rerun to get cross-references right.
 Package tagpdf Info: closing structure 2 tagged /Document
 Package tagpdf Info: Finalizing the tagging structure:
 (tagpdf)             Writing out ~25 structure objects