diff --git a/libasn1print/asn1print.c b/libasn1print/asn1print.c
index fc0e7b35b4586e52313458e3634fd99c006df938..082b3a3a53266ddf50f6ff86556d008f3ef5f647 100644
--- a/libasn1print/asn1print.c
+++ b/libasn1print/asn1print.c
@@ -126,9 +126,9 @@ asn1print_oid(int prior_len, asn1p_oid_t *oid, enum asn1print_flags flags) {
 	for(ac = 0; ac < oid->arcs_count; ac++) {
 		const char *arcname = oid->arcs[ac].name;
 
-		if(accum + strlen(arcname ? arcname : "") > 75) {
+		if(accum + strlen(arcname ? arcname : "") > 72) {
 			printf("\n\t");
-			accum = 0;
+			accum = 8;
 		} else {
 			accum += printf(" ");
 		}
diff --git a/tests/07-int-OK.asn1.-EF b/tests/07-int-OK.asn1.-EF
index 86ee7f84f3e7c8a8922a29ba9a740ffb7f812400..2ec50fcd19dca22cd813b61fc63119ae70975e2d 100644
--- a/tests/07-int-OK.asn1.-EF
+++ b/tests/07-int-OK.asn1.-EF
@@ -1,5 +1,5 @@
-ModuleTestInt1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363)
-	software(1) asn1c(5) test(1) 7 }
+ModuleTestInt1 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 7 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/14-resolver-OK.asn1.-EF b/tests/14-resolver-OK.asn1.-EF
index 2ab60ee2a9e91902fa0c66bd139790556ea88203..8c3eb0fad7dec63cc52ee5e293127ab27ce063d1 100644
--- a/tests/14-resolver-OK.asn1.-EF
+++ b/tests/14-resolver-OK.asn1.-EF
@@ -32,8 +32,8 @@ Enumeration ::= ENUMERATED {
 
 END
 
-HiddenModule { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363)
-	software(1) asn1c(5) test(1) 14 3 }
+HiddenModule { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 14 3 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/32-sequence-of-OK.asn1.-EF b/tests/32-sequence-of-OK.asn1.-EF
index 9809141b75c393024b78c15233c1bcff33787355..1fa4e101b5cbfdf0a87d7d3c97d5d44535b35251 100644
--- a/tests/32-sequence-of-OK.asn1.-EF
+++ b/tests/32-sequence-of-OK.asn1.-EF
@@ -1,5 +1,5 @@
-ModuleTestSequenceSimple { iso org(3) dod(6) internet(1) private(4) enterprise(1)
-	spelio(9363) software(1) asn1c(5) test(1) 32 }
+ModuleTestSequenceSimple { iso org(3) dod(6) internet(1) private(4)
+	enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 32 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/55-components-of-OK.asn1.-EF b/tests/55-components-of-OK.asn1.-EF
index 3251d432fa6c160185d0b9949bbf8a83ddfd4c4b..b7b227fe7b2fe0c7eea79f3225d34e724b1bd312 100644
--- a/tests/55-components-of-OK.asn1.-EF
+++ b/tests/55-components-of-OK.asn1.-EF
@@ -1,5 +1,5 @@
-ModuleTestComponentsOf { iso org(3) dod(6) internet(1) private(4) enterprise(1)
-	spelio(9363) software(1) asn1c(5) test(1) 55 }
+ModuleTestComponentsOf { iso org(3) dod(6) internet(1) private(4)
+	enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 55 }
 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
diff --git a/tests/60-any-OK.asn1.-EF b/tests/60-any-OK.asn1.-EF
index 520c6c9f0fe342b8dc084c81357ac4aece6868dc..73c658fd80f0853d1fab2d3a94f132e694d3095c 100644
--- a/tests/60-any-OK.asn1.-EF
+++ b/tests/60-any-OK.asn1.-EF
@@ -1,5 +1,5 @@
-ModuleTestANY { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363)
-	software(1) asn1c(5) test(1) 60 }
+ModuleTestANY { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 60 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
index 45cb51564300cfe5a54b253af181851425d1d384..8f9cc6ba8936911d4665712d2a663337051a9cf6 100644
--- a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
+++ b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
@@ -1,5 +1,6 @@
 ModuleTestIntegerAndEnumeratedConstraints { iso org(3) dod(6) internet(1)
-	private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 74 }
+	private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
+	74 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/79-constrained-by-OK.asn1.-EF b/tests/79-constrained-by-OK.asn1.-EF
index 0a91f340d4ccacdeeaa8340d86c52adc2b61583c..f462be006e8fd1a27b79d7952a61f9e5892bafff 100644
--- a/tests/79-constrained-by-OK.asn1.-EF
+++ b/tests/79-constrained-by-OK.asn1.-EF
@@ -1,5 +1,5 @@
-ModuleTestConstrainedBy { iso org(3) dod(6) internet(1) private(4) enterprise(1)
-	spelio(9363) software(1) asn1c(5) test(1) 79 }
+ModuleTestConstrainedBy { iso org(3) dod(6) internet(1) private(4)
+	enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 79 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/82-with-comps-OK.asn1.-EF b/tests/82-with-comps-OK.asn1.-EF
index 34ea419ce116651e21b89a7b16179aa4e0f1e1ff..f4fe9aaa704d52a2440c0a991ee20c89635b85c9 100644
--- a/tests/82-with-comps-OK.asn1.-EF
+++ b/tests/82-with-comps-OK.asn1.-EF
@@ -1,5 +1,5 @@
-ModuleTestWithComponents { iso org(3) dod(6) internet(1) private(4) enterprise(1)
-	spelio(9363) software(1) asn1c(5) test(1) 82 }
+ModuleTestWithComponents { iso org(3) dod(6) internet(1) private(4)
+	enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 82 }
 DEFINITIONS ::=
 BEGIN