diff --git a/testenv/Makefile.am b/testenv/Makefile.am
index 94be0236..f14be076 100644
--- a/testenv/Makefile.am
+++ b/testenv/Makefile.am
@@ -31,7 +31,8 @@ if METALINK_IS_ENABLED
Test-metalink-xml.py \
Test-metalink-xml-continue.py \
Test-metalink-xml-relpath.py \
- Test-metalink-xml-abspath.py
+ Test-metalink-xml-abspath.py \
+ Test-metalink-xml-homepath.py
else
METALINK_TESTS =
endif
diff --git a/testenv/Test-metalink-xml-homepath.py b/testenv/Test-metalink-xml-homepath.py
new file mode 100755
index 00000000..aa06f2be
--- /dev/null
+++ b/testenv/Test-metalink-xml-homepath.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+from sys import exit
+from test.http_test import HTTPTest
+from misc.wget_file import WgetFile
+import hashlib
+
+"""
+ This is to test if Metalink XML file escapes current directory.
+"""
+############# File Definitions ###############################################
+File1 = "Would you like some Tea?"
+File1_lowPref = "Do not take this"
+File1_sha256 = hashlib.sha256 (File1.encode ('UTF-8')).hexdigest ()
+MetaXml = \
+"""
+
+
+ GNU Wget
+
+
+ GNU GPL
+ http://www.gnu.org/licenses/gpl.html
+
+ Wget Test File 1
+ 1.2.3
+ Wget Test File 1 description
+
+
+
+ {{FILE1_HASH}}
+
+
+ http://broken.example/File1
+ http://{{SRV_HOST}}:{{SRV_PORT}}/File1_lowPref
+ http://{{SRV_HOST}}:{{SRV_PORT}}/File1
+
+
+
+
+"""
+
+A_File = WgetFile ("File1", File1)
+B_File = WgetFile ("File1_lowPref", File1_lowPref)
+MetaFile = WgetFile ("test.metalink", MetaXml)
+
+WGET_OPTIONS = "--input-metalink test.metalink"
+WGET_URLS = [[]]
+
+Files = [[A_File, B_File]]
+Existing_Files = [MetaFile]
+
+ExpectedReturnCode = 0
+ExpectedDownloadedFiles = [MetaFile]
+
+################ Pre and Post Test Hooks #####################################
+pre_test = {
+ "ServerFiles" : Files,
+ "LocalFiles" : Existing_Files
+}
+test_options = {
+ "WgetCommands" : WGET_OPTIONS,
+ "Urls" : WGET_URLS
+}
+post_test = {
+ "ExpectedFiles" : ExpectedDownloadedFiles,
+ "ExpectedRetcode" : ExpectedReturnCode
+}
+
+http_test = HTTPTest (
+ pre_hook=pre_test,
+ test_params=test_options,
+ post_hook=post_test,
+)
+
+http_test.server_setup()
+### Get and use dynamic server sockname
+srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+
+MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
+MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
+MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
+MetaFile.content = MetaXml
+
+err = http_test.begin ()
+
+exit (err)
diff --git a/testenv/Test-metalink-xml-relpath.py b/testenv/Test-metalink-xml-relpath.py
index c565302a..9790cd40 100755
--- a/testenv/Test-metalink-xml-relpath.py
+++ b/testenv/Test-metalink-xml-relpath.py
@@ -25,7 +25,47 @@ MetaXml = \
1.2.3
Wget Test File 1 description
+
+
+ {{FILE1_HASH}}
+
+
+ http://{{SRV_HOST}}:{{SRV_PORT}}/File1
+
+
+
+
+ {{FILE1_HASH}}
+
+
+ http://{{SRV_HOST}}:{{SRV_PORT}}/File1
+
+
+
+ {{FILE1_HASH}}
+
+
+ http://{{SRV_HOST}}:{{SRV_PORT}}/File1
+
+
+
+
+ {{FILE1_HASH}}
+
+
+ http://{{SRV_HOST}}:{{SRV_PORT}}/File1
+
+
+
+
+ {{FILE1_HASH}}
+
+
+ http://{{SRV_HOST}}:{{SRV_PORT}}/File1
+
+
+
{{FILE1_HASH}}
@@ -50,7 +90,7 @@ Files = [[A_File, B_File]]
Existing_Files = [MetaFile]
ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [MetaFile]
+ExpectedDownloadedFiles = [WgetFile ("dir/subdir/File1", File1), MetaFile]
################ Pre and Post Test Hooks #####################################
pre_test = {