diff --git a/scripts/download_testfiles.sh b/scripts/download_testfiles.sh
index 8ead59c..fab0a51 100755
--- a/scripts/download_testfiles.sh
+++ b/scripts/download_testfiles.sh
@@ -17,6 +17,13 @@ fail() {
     echo "${bold}==> ${red}FAILURE:${normal} ${bold}${1}${normal}"
 }
 
+# find source location
+srcdir=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
+if ! [[ -d $srcdir/testfiles ]]; then
+    fail "The tagparser checkout \"$srcdir\" does not contain a testfiles directory."
+    exit -2
+fi
+
 # read args
 testfilespath="$1"
 testfileurl="$2"
@@ -102,7 +109,21 @@ mkdir -p flac
     || inform "Skipping already existing flac/test.flac"
 # FLAC in Ogg
 [[ ! -f flac/test.ogg ]] \
-    && ffmpeg -i flac/test.flac -c:a copy flac/test.ogg \
+    && ffmpeg -i flac/test.flac -vn -c:a copy flac/test.ogg \
     || inform "Skipping already existing flac/test.ogg"
 
+# convert further Mkv files mkvmerge
+inform "Creating further testfiles with mkvmerge"
+[[ ! -f mkv/nested-tags.mkv ]] \
+    && mkvmerge --ui-language en_US \
+                --output 'mkv/nested-tags.mkv' \
+                --no-global-tags \
+                --language '0:und' \
+                --default-track '0:yes' \
+                --language '1:und' \
+                --default-track '1:yes' \
+                \( 'mtx-test-data/mkv/tags.mkv' \) \
+                --global-tags "$srcdir/testfiles/mkv/nested-tags.xml" \
+                --track-order '0:0,0:1'
+
 success "All testfiles downloaded/converted!"
diff --git a/tests/overall.h b/tests/overall.h
index 7d5c20c..6a0174e 100644
--- a/tests/overall.h
+++ b/tests/overall.h
@@ -109,7 +109,6 @@ private:
     void setOggTestMetaData();
     void removeAllTags();
     void noop();
-    void createMkvWithNestedTags();
     void alterMp4Tracks();
     void removeSecondTrack();
 
@@ -141,9 +140,6 @@ private:
     TagValue m_testPosition;
     string m_testCover;
     queue<TagValue> m_preservedMetaData;
-    string m_nestedTagsMkvPath;
-    string m_rawFlacPath;
-    string m_flacInOggPath;
     TagStatus m_tagStatus;
     uint16 m_mode;
     ElementPosition m_expectedTagPos;
diff --git a/tests/overallgeneral.cpp b/tests/overallgeneral.cpp
index 2ae844b..9cf1443 100644
--- a/tests/overallgeneral.cpp
+++ b/tests/overallgeneral.cpp
@@ -23,11 +23,6 @@ void OverallTests::setUp()
 
 void OverallTests::tearDown()
 {
-    for (const string &file : { m_nestedTagsMkvPath, m_rawFlacPath, m_flacInOggPath }) {
-        if (!file.empty()) {
-            remove(file.data());
-        }
-    }
 }
 
 /*!
diff --git a/tests/overallmkv.cpp b/tests/overallmkv.cpp
index 49655cb..6bbfe5f 100644
--- a/tests/overallmkv.cpp
+++ b/tests/overallmkv.cpp
@@ -478,7 +478,7 @@ void OverallTests::checkMkvTestfileHandbrakeChapters()
 }
 
 /*!
- * \brief Checks "mtx-test-data/mkv/nested-tags.mkv" ("mtx-test-data/mkv/tags.mkv" where "mkv/nested-tags.xml" has been applied).
+ * \brief Checks "mkv/nested-tags.mkv" ("mtx-test-data/mkv/tags.mkv" where "mkv/nested-tags.xml" has been applied).
  */
 void OverallTests::checkMkvTestfileNestedTags()
 {
@@ -627,35 +627,6 @@ void OverallTests::setMkvTestMetaData()
     attachment->setName("cover.jpg");
 }
 
-/*!
- * \brief Creates a Matroska test file with nested tags from "mtx-test-data/mkv/nested-tags.mkv" using "mkv/nested-tags.xml".
- * \remarks Requires mkvmerge.
- * \todo Make mkvmerge path variable.
- */
-void OverallTests::createMkvWithNestedTags()
-{
-#ifdef PLATFORM_UNIX
-    m_nestedTagsMkvPath = workingCopyPathMode("mtx-test-data/mkv/nested-tags.mkv", WorkingCopyMode::NoCopy);
-    remove(m_nestedTagsMkvPath.data());
-
-    cerr << "\n\n- Create testfile \"" << m_nestedTagsMkvPath << "\" with mkvmerge" << endl;
-    const string tagsMkvPath(testFilePath("mtx-test-data/mkv/tags.mkv"));
-    const string tagsXmlPath(testFilePath("mkv/nested-tags.xml"));
-    const char *const mkvmergeArgs[] = { "--ui-language en_US", "--output", m_nestedTagsMkvPath.data(), "--no-global-tags", "--language", "0:und",
-        "--default-track", "0:yes", "--language", "1:und", "--default-track", "1:yes", "(", tagsMkvPath.data(), ")", "--global-tags",
-        tagsXmlPath.data(), "--track-order", "0:0,0:1", nullptr };
-    string mkvmergeOutput, mkvmergeErrors;
-    int res = execHelperApp("/usr/bin/mkvmerge", mkvmergeArgs, mkvmergeOutput, mkvmergeErrors);
-    cout << mkvmergeOutput << endl;
-    cerr << mkvmergeErrors << endl;
-    if (res) {
-        cerr << "- failure (exit code " << res << "); unable to test nested tags" << endl;
-        remove(m_nestedTagsMkvPath.data());
-        m_nestedTagsMkvPath.clear();
-    }
-#endif
-}
-
 /*!
  * \brief Tests the Matroska parser via MediaFileInfo.
  */
@@ -664,19 +635,16 @@ void OverallTests::testMkvParsing()
     cerr << endl << "Matroska parser" << endl;
     m_fileInfo.setForceFullParse(false);
     m_tagStatus = TagStatus::Original;
-    parseFile(TestUtilities::testFilePath("matroska_wave1/test1.mkv"), &OverallTests::checkMkvTestfile1);
-    parseFile(TestUtilities::testFilePath("matroska_wave1/test2.mkv"), &OverallTests::checkMkvTestfile2);
-    parseFile(TestUtilities::testFilePath("matroska_wave1/test3.mkv"), &OverallTests::checkMkvTestfile3);
-    parseFile(TestUtilities::testFilePath("matroska_wave1/test4.mkv"), &OverallTests::checkMkvTestfile4);
-    parseFile(TestUtilities::testFilePath("matroska_wave1/test5.mkv"), &OverallTests::checkMkvTestfile5);
-    parseFile(TestUtilities::testFilePath("matroska_wave1/test6.mkv"), &OverallTests::checkMkvTestfile6);
-    parseFile(TestUtilities::testFilePath("matroska_wave1/test7.mkv"), &OverallTests::checkMkvTestfile7);
-    parseFile(TestUtilities::testFilePath("matroska_wave1/test8.mkv"), &OverallTests::checkMkvTestfile8);
-    parseFile(TestUtilities::testFilePath("mtx-test-data/mkv/handbrake-chapters-2.mkv"), &OverallTests::checkMkvTestfileHandbrakeChapters);
-    createMkvWithNestedTags();
-    if (!m_nestedTagsMkvPath.empty()) {
-        parseFile(m_nestedTagsMkvPath, &OverallTests::checkMkvTestfileNestedTags);
-    }
+    parseFile(testFilePath("matroska_wave1/test1.mkv"), &OverallTests::checkMkvTestfile1);
+    parseFile(testFilePath("matroska_wave1/test2.mkv"), &OverallTests::checkMkvTestfile2);
+    parseFile(testFilePath("matroska_wave1/test3.mkv"), &OverallTests::checkMkvTestfile3);
+    parseFile(testFilePath("matroska_wave1/test4.mkv"), &OverallTests::checkMkvTestfile4);
+    parseFile(testFilePath("matroska_wave1/test5.mkv"), &OverallTests::checkMkvTestfile5);
+    parseFile(testFilePath("matroska_wave1/test6.mkv"), &OverallTests::checkMkvTestfile6);
+    parseFile(testFilePath("matroska_wave1/test7.mkv"), &OverallTests::checkMkvTestfile7);
+    parseFile(testFilePath("matroska_wave1/test8.mkv"), &OverallTests::checkMkvTestfile8);
+    parseFile(testFilePath("mtx-test-data/mkv/handbrake-chapters-2.mkv"), &OverallTests::checkMkvTestfileHandbrakeChapters);
+    parseFile(testFilePath("mkv/nested-tags.mkv"), &OverallTests::checkMkvTestfileNestedTags);
 }
 
 #ifdef PLATFORM_UNIX
@@ -773,14 +741,11 @@ void OverallTests::testMkvMakingWithDifferentSettings()
  */
 void OverallTests::testMkvMakingNestedTags()
 {
-    createMkvWithNestedTags();
-    if (!m_nestedTagsMkvPath.empty()) {
-        cerr << endl << "Matroska maker - rewrite file with nested tags" << endl;
-        m_fileInfo.setMinPadding(0);
-        m_fileInfo.setMaxPadding(0);
-        m_fileInfo.setTagPosition(ElementPosition::BeforeData);
-        m_fileInfo.setIndexPosition(ElementPosition::BeforeData);
-        makeFile(m_nestedTagsMkvPath, &OverallTests::noop, &OverallTests::checkMkvTestfileNestedTags);
-    }
+    cerr << endl << "Matroska maker - rewrite file with nested tags" << endl;
+    m_fileInfo.setMinPadding(0);
+    m_fileInfo.setMaxPadding(0);
+    m_fileInfo.setTagPosition(ElementPosition::BeforeData);
+    m_fileInfo.setIndexPosition(ElementPosition::BeforeData);
+    makeFile(workingCopyPath("mkv/nested-tags.mkv"), &OverallTests::noop, &OverallTests::checkMkvTestfileNestedTags);
 }
 #endif