From 4891139ebd11719c1d0879157d322a5f382f9d18 Mon Sep 17 00:00:00 2001
From: bmribler <39579120+bmribler@users.noreply.github.com>
Date: Mon, 8 Jun 2026 14:44:10 -0400
Subject: [PATCH] Updated h5dump --xml (#6394)

* Updated h5dump --xml

The location of the files HDF5-File.xsd and HDF5-File.dtd no longer exists, and
the files were added to the repo (PR #5490).  Before the --xml is actually removed,
running the h5dump tests will fail.  This PR updated h5dump and the expected output
to use the correct files' location and actually completed the ticket HELP-2668.

* Added missing expected files from the previous commit

* Fixed typo

* Made corrections per review feedbacks

* Committing clang-format changes

* Missing files from previous commit

* Use valid URL for xmlns

---------

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 src/H5Dpublic.h                                   |  2 +-
 tools/src/h5dump/h5dump.c                         | 15 +++++++++------
 tools/test/h5dump/expected/xml/tall-2A.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tall.h5.xml        |  2 +-
 tools/test/h5dump/expected/xml/tarray1.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tarray2.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tarray3.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tarray6.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tarray7.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tattr.h5.xml       |  2 +-
 tools/test/h5dump/expected/xml/tbfloat16.h5.xml   |  2 +-
 .../test/h5dump/expected/xml/tbfloat16_be.h5.xml  |  2 +-
 .../test/h5dump/expected/xml/tbitfields_be.h5.xml |  2 +-
 .../test/h5dump/expected/xml/tbitfields_le.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/tcompound.h5.xml   |  2 +-
 tools/test/h5dump/expected/xml/tcompound2.h5.xml  |  2 +-
 .../h5dump/expected/xml/tcompound_complex.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tdatareg.h5.xml    |  2 +-
 tools/test/h5dump/expected/xml/tdset.h5.xml       |  2 +-
 tools/test/h5dump/expected/xml/tdset2.h5.xml      |  2 +-
 .../test/h5dump/expected/xml/tempty-dtd-2.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tempty-dtd.h5.xml  |  2 +-
 .../test/h5dump/expected/xml/tempty-nons-2.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/tempty-nons.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/tempty-ns.h5.xml   |  2 +-
 tools/test/h5dump/expected/xml/tempty.h5.xml      |  2 +-
 tools/test/h5dump/expected/xml/tenum.h5.xml       |  2 +-
 tools/test/h5dump/expected/xml/test35.nc.xml      |  2 +-
 tools/test/h5dump/expected/xml/textlink.h5.xml    |  2 +-
 tools/test/h5dump/expected/xml/tfloat16.h5.xml    |  2 +-
 tools/test/h5dump/expected/xml/tfloat16_be.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/tfpformat.h5.xml   |  2 +-
 tools/test/h5dump/expected/xml/tgroup.h5.xml      |  2 +-
 tools/test/h5dump/expected/xml/thlink.h5.xml      |  2 +-
 tools/test/h5dump/expected/xml/tloop.h5.xml       |  2 +-
 tools/test/h5dump/expected/xml/tloop2.h5.xml      |  2 +-
 tools/test/h5dump/expected/xml/tmany.h5.xml       |  2 +-
 tools/test/h5dump/expected/xml/tname-amp.h5.xml   |  2 +-
 tools/test/h5dump/expected/xml/tname-apos.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tname-gt.h5.xml    |  2 +-
 tools/test/h5dump/expected/xml/tname-lt.h5.xml    |  2 +-
 tools/test/h5dump/expected/xml/tname-quot.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tname-sp.h5.xml    |  2 +-
 .../h5dump/expected/xml/tnamed_dtype_attr.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tnestedcomp.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/tnodata.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tnullspace.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tobjref.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/topaque.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/torderattr1.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/torderattr2.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/torderattr3.h5.xml |  2 +-
 tools/test/h5dump/expected/xml/torderattr4.h5.xml |  2 +-
 .../h5dump/expected/xml/tref-escapes-at.h5.xml    |  2 +-
 .../test/h5dump/expected/xml/tref-escapes.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tref.h5.xml        |  2 +-
 tools/test/h5dump/expected/xml/tsaf.h5.xml        |  2 +-
 tools/test/h5dump/expected/xml/tslink.h5.xml      |  2 +-
 tools/test/h5dump/expected/xml/tstr.h5.xml        |  2 +-
 tools/test/h5dump/expected/xml/tstr2.h5.xml       |  2 +-
 tools/test/h5dump/expected/xml/tstring-at.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tstring.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tudlink.h5.xml     |  2 +-
 tools/test/h5dump/expected/xml/tvldtypes1.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tvldtypes2.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tvldtypes3.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tvldtypes4.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tvldtypes5.h5.xml  |  2 +-
 tools/test/h5dump/expected/xml/tvlstr.h5.xml      |  2 +-
 70 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index c3a01d2b78a..5fa018ad496 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -1788,7 +1788,7 @@ H5_DLL herr_t H5Dget_chunk_index_type(hid_t did, H5D_chunk_index_t *idx_type);
  *          name is not limited.
  *
  *          \p dcpl_id is an #H5P_DATASET_CREATE property list created with \p
- *          H5reate1() and initialized with various property list functions
+ *          H5Dcreate1() and initialized with various property list functions
  *          described in Property List Interface.
  *
  *          H5Dcreate() and H5Dcreate_anon() return an error if the dataset's
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 8ba89b43a8a..8388d2d9687 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -52,8 +52,10 @@ static H5FD_onion_fapl_info_t onion_fa_g = {
 };
 
 /* module-scoped variables for XML option */
-#define DEFAULT_XSD "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"
-#define DEFAULT_DTD "http://www.hdfgroup.org/HDF5/XML/DTD/HDF5-File.dtd"
+#define DEFAULT_XSD                                                                                          \
+    "https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd"
+#define DEFAULT_DTD                                                                                          \
+    "https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.dtd"
 
 /* Standard DDL output */
 static const dump_functions ddl_function_table = {
@@ -1594,11 +1596,12 @@ main(int argc, char *argv[])
                         *indx = '\0';
 
                     PRINTSTREAM(rawoutstream,
-                                "<%sHDF5-File xmlns:%s=\"http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd\" "
+                                "<%sHDF5-File xmlns:%s=\"%s\" "
                                 "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
-                                "xsi:schemaLocation=\"http://hdfgroup.org/HDF5/XML/schema/HDF5-File "
-                                "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd\">\n",
-                                xmlnsprefix, ns);
+                                "xsi:schemaLocation=\"https://github.com/HDFGroup/hdf5/blob/develop/tools/"
+                                "test/h5dump/testfiles/xml "
+                                "%s\">\n",
+                                xmlnsprefix, ns, DEFAULT_XSD, DEFAULT_XSD);
                     free(ns);
                 }
             }
diff --git a/tools/test/h5dump/expected/xml/tall-2A.h5.xml b/tools/test/h5dump/expected/xml/tall-2A.h5.xml
index c7d2fcf0c36..c1047b7555a 100644
--- a/tools/test/h5dump/expected/xml/tall-2A.h5.xml
+++ b/tools/test/h5dump/expected/xml/tall-2A.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Attribute Name="attr1">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tall.h5.xml b/tools/test/h5dump/expected/xml/tall.h5.xml
index ba130f17485..b4e40f58eaf 100644
--- a/tools/test/h5dump/expected/xml/tall.h5.xml
+++ b/tools/test/h5dump/expected/xml/tall.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Attribute Name="attr1">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tarray1.h5.xml b/tools/test/h5dump/expected/xml/tarray1.h5.xml
index 26d2d9b1fb8..d3fc805d504 100644
--- a/tools/test/h5dump/expected/xml/tarray1.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray1.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tarray2.h5.xml b/tools/test/h5dump/expected/xml/tarray2.h5.xml
index 8f4f31248cf..9c24df36539 100644
--- a/tools/test/h5dump/expected/xml/tarray2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tarray3.h5.xml b/tools/test/h5dump/expected/xml/tarray3.h5.xml
index 38799945f5e..5f332adad57 100644
--- a/tools/test/h5dump/expected/xml/tarray3.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray3.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tarray6.h5.xml b/tools/test/h5dump/expected/xml/tarray6.h5.xml
index 0fb50ed487b..1e667748ae9 100644
--- a/tools/test/h5dump/expected/xml/tarray6.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray6.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tarray7.h5.xml b/tools/test/h5dump/expected/xml/tarray7.h5.xml
index e6a5bca684b..be538ac8e40 100644
--- a/tools/test/h5dump/expected/xml/tarray7.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray7.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tattr.h5.xml b/tools/test/h5dump/expected/xml/tattr.h5.xml
index ce543602694..5feb9d9d7fb 100644
--- a/tools/test/h5dump/expected/xml/tattr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tattr.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Attribute Name="/attr1">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tbfloat16.h5.xml b/tools/test/h5dump/expected/xml/tbfloat16.h5.xml
index 97697edd112..4a785e3abeb 100644
--- a/tools/test/h5dump/expected/xml/tbfloat16.h5.xml
+++ b/tools/test/h5dump/expected/xml/tbfloat16.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Dataset Name="DS16BITS" OBJ-XID="xid_800" H5Path= "/DS16BITS" Parents="xid_96" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tbfloat16_be.h5.xml b/tools/test/h5dump/expected/xml/tbfloat16_be.h5.xml
index 38a66bb52b3..ed5c496db28 100644
--- a/tools/test/h5dump/expected/xml/tbfloat16_be.h5.xml
+++ b/tools/test/h5dump/expected/xml/tbfloat16_be.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Dataset Name="DS16BITS" OBJ-XID="xid_800" H5Path= "/DS16BITS" Parents="xid_96" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml
index 26bbd919bd8..c6b058ab944 100644
--- a/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml
+++ b/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests">
diff --git a/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml
index c8ba0260c55..17033fcd536 100644
--- a/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml
+++ b/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests">
diff --git a/tools/test/h5dump/expected/xml/tcompound.h5.xml b/tools/test/h5dump/expected/xml/tcompound.h5.xml
index 5c74493fe7e..54a2732e0d2 100644
--- a/tools/test/h5dump/expected/xml/tcompound.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:NamedDataType Name="#6632" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/">
       <hdf5:DataType>
diff --git a/tools/test/h5dump/expected/xml/tcompound2.h5.xml b/tools/test/h5dump/expected/xml/tcompound2.h5.xml
index 5c69cefd8e1..108596fbcb2 100644
--- a/tools/test/h5dump/expected/xml/tcompound2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:NamedDataType Name="#9560" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/">
       <hdf5:DataType>
diff --git a/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml b/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml
index 92bd64d1e86..e3d60db9b48 100644
--- a/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="CompoundComplex" OBJ-XID="xid_976" H5Path= "/CompoundComplex" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tdatareg.h5.xml b/tools/test/h5dump/expected/xml/tdatareg.h5.xml
index ea65384dd73..d1a21ecf497 100644
--- a/tools/test/h5dump/expected/xml/tdatareg.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdatareg.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1284" H5Path= "/Dataset1" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tdset.h5.xml b/tools/test/h5dump/expected/xml/tdset.h5.xml
index 80dcf6f5908..d2220bc19b9 100644
--- a/tools/test/h5dump/expected/xml/tdset.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdset.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_976" H5Path= "/dset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tdset2.h5.xml b/tools/test/h5dump/expected/xml/tdset2.h5.xml
index 7f78685b994..855eec6b06f 100644
--- a/tools/test/h5dump/expected/xml/tdset2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdset2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml
index 213d58214f7..fbbce11b5ae 100644
--- a/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/HDF5/XML/DTD/HDF5-File.dtd">
+<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="xid_928" H5Path="/">
    <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/">
diff --git a/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml
index 213d58214f7..fbbce11b5ae 100644
--- a/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/HDF5/XML/DTD/HDF5-File.dtd">
+<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="xid_928" H5Path="/">
    <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/">
diff --git a/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml
index 219dbfd645a..69049dd21a3 100644
--- a/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <RootGroup OBJ-XID="xid_928" H5Path="/">
    <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/">
       <StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tempty-nons.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons.h5.xml
index 219dbfd645a..69049dd21a3 100644
--- a/tools/test/h5dump/expected/xml/tempty-nons.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-nons.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <RootGroup OBJ-XID="xid_928" H5Path="/">
    <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/">
       <StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml
index 00040d22000..ae89973aaaf 100644
--- a/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<thing:HDF5-File xmlns:thing="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<thing:HDF5-File xmlns:thing="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <thing:RootGroup OBJ-XID="xid_928" H5Path="/">
    <thing:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/">
       <thing:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tempty-ns.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns.h5.xml
index 00040d22000..ae89973aaaf 100644
--- a/tools/test/h5dump/expected/xml/tempty-ns.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-ns.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<thing:HDF5-File xmlns:thing="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<thing:HDF5-File xmlns:thing="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <thing:RootGroup OBJ-XID="xid_928" H5Path="/">
    <thing:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/">
       <thing:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tempty.h5.xml b/tools/test/h5dump/expected/xml/tempty.h5.xml
index 41eef379ee6..b326b25ec87 100644
--- a/tools/test/h5dump/expected/xml/tempty.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tenum.h5.xml b/tools/test/h5dump/expected/xml/tenum.h5.xml
index 33a6e625e2f..a62f195866f 100644
--- a/tools/test/h5dump/expected/xml/tenum.h5.xml
+++ b/tools/test/h5dump/expected/xml/tenum.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:NamedDataType Name="enum normal" OBJ-XID="xid_976" H5Path="/enum normal" Parents="xid_928" H5ParentPaths="/">
       <hdf5:DataType>
diff --git a/tools/test/h5dump/expected/xml/test35.nc.xml b/tools/test/h5dump/expected/xml/test35.nc.xml
index a38ed8a1081..11b3cf58a40 100644
--- a/tools/test/h5dump/expected/xml/test35.nc.xml
+++ b/tools/test/h5dump/expected/xml/test35.nc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_48" H5Path="/">
    <hdf5:Attribute Name="aaa">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/textlink.h5.xml b/tools/test/h5dump/expected/xml/textlink.h5.xml
index 9097f79096f..75d45b9647c 100644
--- a/tools/test/h5dump/expected/xml/textlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/textlink.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:ExternalLink LinkName="extlink1" OBJ-XID="xid_18446744073709551614" H5SourcePath="/extlink1" TargetFilename="filename"  TargetPath="objname"  Parents="xid_96" H5ParentPaths="/" />
    <hdf5:ExternalLink LinkName="extlink2" OBJ-XID="xid_18446744073709551613" H5SourcePath="/extlink2" TargetFilename="anotherfile"  TargetPath="anotherobj"  Parents="xid_96" H5ParentPaths="/" />
diff --git a/tools/test/h5dump/expected/xml/tfloat16.h5.xml b/tools/test/h5dump/expected/xml/tfloat16.h5.xml
index 6b2c0416ac0..cd20f8b8a9e 100644
--- a/tools/test/h5dump/expected/xml/tfloat16.h5.xml
+++ b/tools/test/h5dump/expected/xml/tfloat16.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Dataset Name="DS16BITS" OBJ-XID="xid_800" H5Path= "/DS16BITS" Parents="xid_96" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tfloat16_be.h5.xml b/tools/test/h5dump/expected/xml/tfloat16_be.h5.xml
index b9116f0cf04..6b777bc15e5 100644
--- a/tools/test/h5dump/expected/xml/tfloat16_be.h5.xml
+++ b/tools/test/h5dump/expected/xml/tfloat16_be.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Dataset Name="DS16BITS" OBJ-XID="xid_800" H5Path= "/DS16BITS" Parents="xid_96" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tfpformat.h5.xml b/tools/test/h5dump/expected/xml/tfpformat.h5.xml
index 644597997a2..6a289eaa1f8 100644
--- a/tools/test/h5dump/expected/xml/tfpformat.h5.xml
+++ b/tools/test/h5dump/expected/xml/tfpformat.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/HDF5/XML/DTD/HDF5-File.dtd">
+<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="xid_96" H5Path="/">
    <Dataset Name="double" OBJ-XID="xid_800" H5Path= "/double" Parents="xid_96" H5ParentPaths="/">
diff --git a/tools/test/h5dump/expected/xml/tgroup.h5.xml b/tools/test/h5dump/expected/xml/tgroup.h5.xml
index 1eaf6623895..a3f93a6bc30 100644
--- a/tools/test/h5dump/expected/xml/tgroup.h5.xml
+++ b/tools/test/h5dump/expected/xml/tgroup.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Group Name="g1.1" OBJ-XID="xid_3616" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" >
diff --git a/tools/test/h5dump/expected/xml/thlink.h5.xml b/tools/test/h5dump/expected/xml/thlink.h5.xml
index d0fa36e190e..cc99c5e2dde 100644
--- a/tools/test/h5dump/expected/xml/thlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/thlink.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_808" H5Path= "/dset1" Parents="xid_96" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tloop.h5.xml b/tools/test/h5dump/expected/xml/tloop.h5.xml
index 8cc68800e19..da1befb37d3 100644
--- a/tools/test/h5dump/expected/xml/tloop.h5.xml
+++ b/tools/test/h5dump/expected/xml/tloop.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Group Name="g1.1" OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" >
diff --git a/tools/test/h5dump/expected/xml/tloop2.h5.xml b/tools/test/h5dump/expected/xml/tloop2.h5.xml
index e2df1025935..a3c479375a2 100644
--- a/tools/test/h5dump/expected/xml/tloop2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tloop2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Group Name="g1.1" OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" >
diff --git a/tools/test/h5dump/expected/xml/tmany.h5.xml b/tools/test/h5dump/expected/xml/tmany.h5.xml
index 842f1f5efe7..60e35342ed5 100644
--- a/tools/test/h5dump/expected/xml/tmany.h5.xml
+++ b/tools/test/h5dump/expected/xml/tmany.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Group Name="g1" OBJ-XID="xid_800" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" >
       <hdf5:Group Name="g1.1" OBJ-XID="xid_1832" H5Path="/g1/g1.1" Parents="xid_800" H5ParentPaths="/g1" >
diff --git a/tools/test/h5dump/expected/xml/tname-amp.h5.xml b/tools/test/h5dump/expected/xml/tname-amp.h5.xml
index e40c38b9267..cb7b1de8e01 100644
--- a/tools/test/h5dump/expected/xml/tname-amp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-amp.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Attribute Name="attr1&amp;withamp">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tname-apos.h5.xml b/tools/test/h5dump/expected/xml/tname-apos.h5.xml
index 2acd0bfd28b..6e88bd2d619 100644
--- a/tools/test/h5dump/expected/xml/tname-apos.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-apos.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Attribute Name="attr1&apos;withapos">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tname-gt.h5.xml b/tools/test/h5dump/expected/xml/tname-gt.h5.xml
index b44949ea516..01edc095a36 100644
--- a/tools/test/h5dump/expected/xml/tname-gt.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-gt.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Attribute Name="attr1&gt;withgt">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tname-lt.h5.xml b/tools/test/h5dump/expected/xml/tname-lt.h5.xml
index b1482751987..13266baf95a 100644
--- a/tools/test/h5dump/expected/xml/tname-lt.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-lt.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Attribute Name="attr1&lt;withlt">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tname-quot.h5.xml b/tools/test/h5dump/expected/xml/tname-quot.h5.xml
index 83fd347841e..08c523119e0 100644
--- a/tools/test/h5dump/expected/xml/tname-quot.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-quot.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Attribute Name="attr1&quot;withquot">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tname-sp.h5.xml b/tools/test/h5dump/expected/xml/tname-sp.h5.xml
index 07b80e40d3c..65b32ea4897 100644
--- a/tools/test/h5dump/expected/xml/tname-sp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-sp.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Attribute Name="attr1 withspace">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml b/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml
index c0e30b41950..ebdc232187f 100644
--- a/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Dataset Name="Dataset" OBJ-XID="xid_1256" H5Path= "/Dataset" Parents="xid_96" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml b/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml
index a5ca2144b33..5095c250907 100644
--- a/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Dataset Name="ArrayOfStructures" OBJ-XID="xid_744" H5Path= "/ArrayOfStructures" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tnodata.h5.xml b/tools/test/h5dump/expected/xml/tnodata.h5.xml
index b60c4dcaacb..0ff3a8c7619 100644
--- a/tools/test/h5dump/expected/xml/tnodata.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnodata.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tnullspace.h5.xml b/tools/test/h5dump/expected/xml/tnullspace.h5.xml
index b1c1974bfcb..7c9b7c76485 100644
--- a/tools/test/h5dump/expected/xml/tnullspace.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnullspace.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Attribute Name="attr">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tobjref.h5.xml b/tools/test/h5dump/expected/xml/tobjref.h5.xml
index 71eb6ed183d..6b9a515454d 100644
--- a/tools/test/h5dump/expected/xml/tobjref.h5.xml
+++ b/tools/test/h5dump/expected/xml/tobjref.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Dataset Name="Dataset3" OBJ-XID="xid_2348" H5Path= "/Dataset3" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/topaque.h5.xml b/tools/test/h5dump/expected/xml/topaque.h5.xml
index c0699f022f5..43b4a693de1 100644
--- a/tools/test/h5dump/expected/xml/topaque.h5.xml
+++ b/tools/test/h5dump/expected/xml/topaque.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Dataset Name="opaque test" OBJ-XID="xid_800" H5Path= "/opaque test" Parents="xid_96" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/torderattr1.h5.xml b/tools/test/h5dump/expected/xml/torderattr1.h5.xml
index e3e56eb4c61..4d69621f777 100644
--- a/tools/test/h5dump/expected/xml/torderattr1.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr1.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Attribute Name="a">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/torderattr2.h5.xml b/tools/test/h5dump/expected/xml/torderattr2.h5.xml
index 1163afb4945..002699bea81 100644
--- a/tools/test/h5dump/expected/xml/torderattr2.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Attribute Name="c">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/torderattr3.h5.xml b/tools/test/h5dump/expected/xml/torderattr3.h5.xml
index 73ef2239544..830c53de548 100644
--- a/tools/test/h5dump/expected/xml/torderattr3.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr3.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Attribute Name="a">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/torderattr4.h5.xml b/tools/test/h5dump/expected/xml/torderattr4.h5.xml
index 1cc78fd323e..e48fe9b19ed 100644
--- a/tools/test/h5dump/expected/xml/torderattr4.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr4.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Attribute Name="c">
       <hdf5:Dataspace>
diff --git a/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml
index 40c6b89b396..b430b816fa8 100644
--- a/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Dataset Name="Dataset space" OBJ-XID="xid_3716" H5Path= "/Group1/Dataset space" Parents="xid_1344" H5ParentPaths="/Group1">
diff --git a/tools/test/h5dump/expected/xml/tref-escapes.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes.h5.xml
index 4ebac85c50b..c6df6ca7703 100644
--- a/tools/test/h5dump/expected/xml/tref-escapes.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref-escapes.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Dataset Name="Dataset space" OBJ-XID="xid_1720" H5Path= "/Group1/Dataset space" Parents="xid_1344" H5ParentPaths="/Group1">
diff --git a/tools/test/h5dump/expected/xml/tref.h5.xml b/tools/test/h5dump/expected/xml/tref.h5.xml
index 4c3fb8fc007..17d538763c0 100644
--- a/tools/test/h5dump/expected/xml/tref.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1720" H5Path= "/Group1/Dataset1" Parents="xid_1344" H5ParentPaths="/Group1">
diff --git a/tools/test/h5dump/expected/xml/tsaf.h5.xml b/tools/test/h5dump/expected/xml/tsaf.h5.xml
index d6467918e26..4a2acb07435 100644
--- a/tools/test/h5dump/expected/xml/tsaf.h5.xml
+++ b/tools/test/h5dump/expected/xml/tsaf.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Dataset Name=".DSL_METADATA" OBJ-XID="xid_744" H5Path= "/.DSL_METADATA" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tslink.h5.xml b/tools/test/h5dump/expected/xml/tslink.h5.xml
index 493decd148a..edfbef86ba9 100644
--- a/tools/test/h5dump/expected/xml/tslink.h5.xml
+++ b/tools/test/h5dump/expected/xml/tslink.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:SoftLink LinkName="slink1" OBJ-XID="xid_18446744073709551614" H5SourcePath="/slink1" TargetPath="somevalue"  Parents="xid_696" H5ParentPaths="/" />
    <hdf5:SoftLink LinkName="slink2" OBJ-XID="xid_18446744073709551613" H5SourcePath="/slink2" TargetPath="linkvalue"  Parents="xid_696" H5ParentPaths="/" />
diff --git a/tools/test/h5dump/expected/xml/tstr.h5.xml b/tools/test/h5dump/expected/xml/tstr.h5.xml
index 32d63afb546..a891b07bb45 100644
--- a/tools/test/h5dump/expected/xml/tstr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstr.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Dataset Name="comp1" OBJ-XID="xid_2520" H5Path= "/comp1" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tstr2.h5.xml b/tools/test/h5dump/expected/xml/tstr2.h5.xml
index 1203417b78a..8bcc8575117 100644
--- a/tools/test/h5dump/expected/xml/tstr2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstr2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" >
       <hdf5:Dataset Name="dset1" OBJ-XID="xid_1720" H5Path= "/g1/dset1" Parents="xid_1344" H5ParentPaths="/g1">
diff --git a/tools/test/h5dump/expected/xml/tstring-at.h5.xml b/tools/test/h5dump/expected/xml/tstring-at.h5.xml
index a8281f46957..24dc72db6ef 100644
--- a/tools/test/h5dump/expected/xml/tstring-at.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstring-at.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tstring.h5.xml b/tools/test/h5dump/expected/xml/tstring.h5.xml
index d68db779b19..ee48b41e747 100644
--- a/tools/test/h5dump/expected/xml/tstring.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstring.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="dset1" OBJ-XID="xid_976" H5Path= "/dset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tudlink.h5.xml b/tools/test/h5dump/expected/xml/tudlink.h5.xml
index 137c47bff46..8d050a8dd7b 100644
--- a/tools/test/h5dump/expected/xml/tudlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/tudlink.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:UserDefined LinkName="udlink1" OBJ-XID="xid_18446744073709551614" H5SourcePath="/udlink1" LinkClass="187"  Parents="xid_96" H5ParentPaths="/" />
    <hdf5:UserDefined LinkName="udlink2" OBJ-XID="xid_18446744073709551613" H5SourcePath="/udlink2" LinkClass="187"  Parents="xid_96" H5ParentPaths="/" />
diff --git a/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml
index b1aa5a65b77..639051080df 100644
--- a/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml
index 662ad3a237a..8e60ac7b64c 100644
--- a/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml
index 56d81a14977..dec9057fd6b 100644
--- a/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml
index 8e31bd93a0e..adb0da759b9 100644
--- a/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml
index be68e0999a3..9c41d9af0d8 100644
--- a/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
    <hdf5:Dataset Name="Dataset" OBJ-XID="xid_976" H5Path= "/Dataset" Parents="xid_928" H5ParentPaths="/">
       <hdf5:StorageLayout>
diff --git a/tools/test/h5dump/expected/xml/tvlstr.h5.xml b/tools/test/h5dump/expected/xml/tvlstr.h5.xml
index d945964e2be..dad5d8c1346 100644
--- a/tools/test/h5dump/expected/xml/tvlstr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvlstr.h5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/HDFGroup/hdf5/blob/develop/tools/test/h5dump/testfiles/xml https://raw.githubusercontent.com/HDFGroup/hdf5/develop/tools/test/h5dump/testfiles/xml/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
    <hdf5:Attribute Name="test_scalar">
       <hdf5:Dataspace>