diff --git a/jena-arq/.gitattributes b/jena-arq/.gitattributes
deleted file mode 100644
index f1618df1b6f..00000000000
--- a/jena-arq/.gitattributes
+++ /dev/null
@@ -1,28 +0,0 @@
-## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-##
-# Some tests require exact line endings
-# GIT will by default override the line endings with the platform default
-# So tell it not to for those files.
-
-testing/RIOT/Lang/TrigStd/trig-subm-15.trig     text eol=lf
-testing/RIOT/Lang/TrigStd/trig-subm-16.trig     text eol=lf
-
-testing/RIOT/Lang/TurtleStd/turtle-subm-15.ttl  text eol=lf
-testing/RIOT/Lang/TurtleStd/turtle-subm-16.ttl  text eol=lf
-
-testing/RIOT/Lang/TrigStd/literal_with_LINE_FEED.trig    text eol=lf
-testing/RIOT/Lang/TurtleStd/literal_with_LINE_FEED.ttl   text eol=lf
-
-testing/RIOT/Lang/TurtleSubm/test-17.ttl        text eol=lf
-testing/RIOT/Lang/TurtleSubm/test-18.ttl        text eol=lf
-
-## The exact copies from rdf-tests-cg
-
-testing/rdf-tests-cg/trig/trig-subm-15.trig     text eol=lf
-testing/rdf-tests-cg/trig/trig-subm-16.trig     text eol=lf
-
-testing/rdf-tests-cg/turtle/turtle-subm-15.ttl  text eol=lf
-testing/rdf-tests-cg/turtle/turtle-subm-16.ttl  text eol=lf
-
-testing/rdf-tests-cg/trig/literal_with_LINE_FEED.trig    text eol=lf
-testing/rdf-tests-cg/turtle/literal_with_LINE_FEED.ttl   text eol=lf
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java b/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
index 866edda51d5..b1383ca9563 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
@@ -110,15 +110,17 @@ public void nodefmt_rdf11_01() {
     // C14N -- Canonicalization. Java escaping make this messy.
     private static Node blankNode = NodeFactory.createBlankNode("ABC");
 
-    @Test public void nodefmt_c14n_00()        { test(nodeFormatterC14N, "'--\\u0009--'", "\"--\\t--\""); }
-    @Test public void nodefmt_c14n_01()        { test(nodeFormatterC14N, "'--\\u0008\\u0009\\u000A\\u000C\\u000D\\u0022\\u005C--'", "\"--\\b\\t\\n\\f\\r\\\"\\\\--\""); }
-    @Test public void nodefmt_c14n_02()        { test(nodeFormatterC14N, "'--\\b\\t\\n\\f\\r\\\"\\\\--'", "\"--\\b\\t\\n\\f\\r\\\"\\\\--\""); }
-    @Test public void nodefmt_c14n_03()        { test(nodeFormatterC14N, "'xyz'@EN-GB--ltr", "\"xyz\"@en-gb--ltr"); }
-    @Test public void nodefmt_c14n_04()        { test(nodeFormatterC14N, "'\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u000B\\u007F'",
-                                                                         "\"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u000B\\u007F\""); }
-    @Test public void nodefmt_c14n_05()        { test(nodeFormatterC14N, "'\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0015\\u0016\\u0017\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001F'",
-                                                                         "\"\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0015\\u0016\\u0017\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001F\""); }
-    @Test public void nodefmt_c14n_06()        { test(nodeFormatterC14N, blankNode, "_:ABC"); }
+    @Test public void nodefmt_c14n_00() { test(nodeFormatterC14N, "'--\\u0009--'", "\"--\\t--\""); }
+    @Test public void nodefmt_c14n_01() { test(nodeFormatterC14N, "'--\\u0008\\u0009\\u000A\\u000C\\u000D\\u0022\\u005C--'", "\"--\\b\\t\\n\\f\\r\\\"\\\\--\""); }
+    @Test public void nodefmt_c14n_02() { test(nodeFormatterC14N, "'--\\b\\t\\n\\f\\r\\\"\\\\--'", "\"--\\b\\t\\n\\f\\r\\\"\\\\--\""); }
+    @Test public void nodefmt_c14n_03() { test(nodeFormatterC14N, "'xyz'@EN-GB--ltr", "\"xyz\"@en-gb--ltr"); }
+    @Test public void nodefmt_c14n_04() { test(nodeFormatterC14N, "'\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u000B\\u007F'",
+                                                                 "\"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u000B\\u007F\""); }
+    @Test public void nodefmt_c14n_05() { test(nodeFormatterC14N, "'\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0015\\u0016\\u0017\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001F'",
+                                                                 "\"\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0015\\u0016\\u0017\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001F\""); }
+    @Test public void nodefmt_c14n_06() { test(nodeFormatterC14N, blankNode, "_:ABC"); }
+
+    // Turtle
 
     @Test public void nodefmt_ttl_01()  { test(nodeFormatterTTL, "?x"); }
     @Test public void nodefmt_ttl_02()  { test(nodeFormatterTTL, "?xyz"); }
@@ -155,8 +157,7 @@ public void nodefmt_rdf11_01() {
 
     @Test public void prefixedname_01() { testPrefix("", ""); }
 
-    private void testPrefix(String prefix, String local)
-    {
+    private void testPrefix(String prefix, String local) {
         assertTrue(NodeFormatterTTL.safeForPrefix(prefix));
         assertTrue(NodeFormatterTTL.safeForPrefixLocalname(local));
     }
diff --git a/jena-arq/testing/rdf-tests-cg/rdf/.gitattributes b/jena-arq/testing/rdf-tests-cg/rdf/.gitattributes
index 501e5284547..f187f79a952 100644
--- a/jena-arq/testing/rdf-tests-cg/rdf/.gitattributes
+++ b/jena-arq/testing/rdf-tests-cg/rdf/.gitattributes
@@ -11,3 +11,5 @@ rdf11/rdf-trig/trig-subm-15.nq               text eol=lf
 rdf11/rdf-trig/trig-subm-16.trig             text eol=lf
 rdf11/rdf-trig/trig-subm-16.nq               text eol=lf
 rdf11/rdf-trig/literal_with_LINE_FEED.trig   text eol=lf
+
+rdf12/**/c14n/*-c14n.nt                      text eol=lf
diff --git a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string-c14n.nq b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string-c14n.nq
index 73c8ed0ba3d..0bbc63ac86e 100644
--- a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string-c14n.nq
+++ b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string-c14n.nq
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> "chat"@en--ltr <http://example/g> .
+<http://a.example/s> <http://a.example/p> "chat"@en-gb--ltr <http://example/g> .
diff --git a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq
index 99f35629669..47f62f384db 100644
--- a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq
+++ b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> "chat"@EN--ltr <http://example/g> .
+<http://a.example/s> <http://a.example/p> "chat"@EN-GB--ltr <http://example/g> .
diff --git a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string-c14n.nt b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string-c14n.nt
index 56ed7892a7d..96c09f99e8d 100644
--- a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string-c14n.nt
+++ b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string-c14n.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> "chat"@en--ltr .
+<http://a.example/s> <http://a.example/p> "chat"@en-gb--ltr .
diff --git a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string.nt b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string.nt
index 87df8ad141b..8ec90b00a5e 100644
--- a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string.nt
+++ b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> "chat"@EN--ltr .
+<http://a.example/s> <http://a.example/p> "chat"@EN-GB--ltr .