diff --git a/extra/xml/tests/errors.factor b/extra/xml/tests/errors.factor
index b421ae011a..6ba0b0d560 100755
--- a/extra/xml/tests/errors.factor
+++ b/extra/xml/tests/errors.factor
@@ -16,7 +16,7 @@ T{ extra-attrs T{ parsing-error f 1 32 } V{ T{ name f "" "foo" f } }
T{ bad-version T{ parsing-error f 1 28 } "5 million" } "" xml-error-test
T{ notags f } "" xml-error-test
T{ multitags f } "" xml-error-test
-T{ bad-prolog T{ parsing-error f 1 26 } T{ prolog f "1.0" "iso-8859-1" f }
+T{ bad-prolog T{ parsing-error f 1 26 } T{ prolog f "1.0" "UTF-8" f }
} "" xml-error-test
T{ capitalized-prolog T{ parsing-error f 1 6 } "XmL" } ""
xml-error-test
diff --git a/extra/xml/tests/templating.factor b/extra/xml/tests/templating.factor
index 6db98ec848..d81e807fe5 100644
--- a/extra/xml/tests/templating.factor
+++ b/extra/xml/tests/templating.factor
@@ -40,4 +40,4 @@ M: object (r-ref) drop ;
sample-doc string>xml dup template xml>string
] with-scope ;
-[ "foo" ] [ test-refs ] unit-test
+[ "
foo" ] [ test-refs ] unit-test
diff --git a/extra/xml/tests/test.factor b/extra/xml/tests/test.factor
index 02c7aecb13..98146136e6 100644
--- a/extra/xml/tests/test.factor
+++ b/extra/xml/tests/test.factor
@@ -26,7 +26,7 @@ SYMBOL: xml-file
] unit-test
[ V{ "fa&g" } ] [ xml-file get "x" get-id tag-children ] unit-test
[ "that" ] [ xml-file get "this" swap at ] unit-test
-[ "" ]
+[ "" ]
[ "" string>xml xml>string ] unit-test
[ "abcd" ] [
"abcd" string>xml
@@ -44,7 +44,7 @@ SYMBOL: xml-file
at swap "z" >r tuck r> swap set-at
T{ name f "blah" "z" f } swap at ] unit-test
[ "foo" ] [ "" string>xml children>string ] unit-test
-[ "bar baz" ]
+[ "bar baz" ]
[ "bar" string>xml [ " baz" append ] map xml>string ] unit-test
-[ "\n\n bar\n" ]
+[ "\n\n bar\n" ]
[ " bar " string>xml pprint-xml>string ] unit-test
diff --git a/extra/xml/tokenize/tokenize.factor b/extra/xml/tokenize/tokenize.factor
index d99c306b2b..b2b7d78b3e 100644
--- a/extra/xml/tokenize/tokenize.factor
+++ b/extra/xml/tokenize/tokenize.factor
@@ -172,7 +172,7 @@ SYMBOL: ns-stack
[ T{ name f "" "version" f } swap at
[ good-version ] [ throw ] if* ] keep
[ T{ name f "" "encoding" f } swap at
- "iso-8859-1" or ] keep
+ "UTF-8" or ] keep
T{ name f "" "standalone" f } swap at
[ yes/no>bool ] [ f ] if*
;
diff --git a/extra/xml/utilities/utilities.factor b/extra/xml/utilities/utilities.factor
index d6814851ee..b397e3c7b1 100755
--- a/extra/xml/utilities/utilities.factor
+++ b/extra/xml/utilities/utilities.factor
@@ -42,7 +42,7 @@ M: process-missing error.
>r 1array r> build-tag* ;
: standard-prolog ( -- prolog )
- T{ prolog f "1.0" "iso-8859-1" f } ;
+ T{ prolog f "1.0" "UTF-8" f } ;
: build-xml ( tag -- xml )
standard-prolog { } rot { } ;
diff --git a/extra/xml/xml.factor b/extra/xml/xml.factor
index 970ff39cf1..61ef27b72e 100644
--- a/extra/xml/xml.factor
+++ b/extra/xml/xml.factor
@@ -63,7 +63,7 @@ M: closer process
V{ } clone xml-stack set f push-xml ;
: default-prolog ( -- prolog )
- "1.0" "iso-8859-1" f ;
+ "1.0" "UTF-8" f ;
: reset-prolog ( -- )
default-prolog prolog-data set ;