diff --git a/cdoc/Tar.cpp b/cdoc/Tar.cpp
index f6688063..383f49e8 100644
--- a/cdoc/Tar.cpp
+++ b/cdoc/Tar.cpp
@@ -268,8 +268,9 @@ libcdoc::TarConsumer::open(const std::string& name, int64_t size)
 		} else {
 			path = std::filesystem::path("./PaxHeaders.X") / path.filename();
 		}
-		LOG_DBG("Pax path: {}", path.string());
-        if (auto rv = writeHeader(path.string(), paxData.size(), 'x'); rv != OK)
+		std::string paxPath = decodeName(path);
+		LOG_DBG("Pax path: {}", paxPath);
+        if (auto rv = writeHeader(paxPath, paxData.size(), 'x'); rv != OK)
             return rv;
         if (auto rv = _dst->write((const uint8_t *) paxData.data(), paxData.size()); rv != paxData.size())
             return rv < OK ? rv : OUTPUT_ERROR;
diff --git a/cdoc/Utils.h b/cdoc/Utils.h
index 68dda1c6..d2e9d570 100644
--- a/cdoc/Utils.h
+++ b/cdoc/Utils.h
@@ -48,6 +48,12 @@ static auto encodeName(std::string_view path)
     return std::u8string_view(reinterpret_cast<const char8_t*>(path.data()), path.size());
 }
 
+static std::string decodeName(const std::filesystem::path& path)
+{
+    auto name = path.u8string();
+    return {reinterpret_cast<const char*>(name.data()), name.size()};
+}
+
 std::string toBase64(const uint8_t *data, size_t len);
 
 static std::string toBase64(const std::vector<uint8_t> &data) {
diff --git a/test/libcdoc_boost.cpp b/test/libcdoc_boost.cpp
index bf8ecd32..544c00b9 100644
--- a/test/libcdoc_boost.cpp
+++ b/test/libcdoc_boost.cpp
@@ -93,12 +93,6 @@ const map<string, string> ExpectedParsedLabel {
     {"cn", "JÕEORG,JAAK-KRISTJAN,38001085718"}
 };
 
-static string decodeName(fs::path path)
-{
-    auto name = path.u8string();
-    return {reinterpret_cast<const char*>(name.data()), name.size()};
-}
-
 /**
  * @brief The base class for Test Fixtures.
  */
@@ -557,7 +551,7 @@ BOOST_FIXTURE_TEST_CASE_WITH_DECOR(DecryptWithPasswordAndLabel, DecryptFixture,
         * utf::description("Decrypting a file with password and given label"))
 {
     libcdoc::RcptInfo rcpt {.type=libcdoc::RcptInfo::LOCK, .label=Label, .secret=Password};
-    decrypt({checkDataFile(sources[0])}, checkTargetFile("PasswordUsageWithoutLabel.cdoc"), decodeName(tmpDataPath), rcpt);
+    decrypt({checkDataFile(sources[0])}, checkTargetFile("PasswordUsageWithoutLabel.cdoc"), libcdoc::decodeName(tmpDataPath), rcpt);
 }
 BOOST_AUTO_TEST_SUITE_END()
 
@@ -828,7 +822,7 @@ struct PaxFixture : public FixtureBase
         std::vector<libcdoc::RcptInfo> rcpts {
             {libcdoc::RcptInfo::PASSWORD, "label", {}, Password}
         };
-        encrypt(2, {srcFile.string()}, cdocFile.string(), rcpts);
+        encrypt(2, {libcdoc::decodeName(srcFile)}, libcdoc::decodeName(cdocFile), rcpts);
 
         libcdoc::RcptInfo rcpt {
             .type=libcdoc::RcptInfo::LOCK,
@@ -836,8 +830,8 @@ struct PaxFixture : public FixtureBase
             .secret=Password
         };
         libcdoc::ToolConf conf;
-        conf.input_files.push_back(cdocFile.string());
-        conf.out = outDir.string();
+        conf.input_files.push_back(libcdoc::decodeName(cdocFile));
+        conf.out = libcdoc::decodeName(outDir);
         libcdoc::CDocCipher cipher;
         BOOST_CHECK_EQUAL(cipher.Decrypt(conf, rcpt), 0);
     }
@@ -860,8 +854,8 @@ BOOST_FIXTURE_TEST_CASE(LongFilename, PaxFixture)
 
 BOOST_FIXTURE_TEST_CASE(NonAsciiFilename, PaxFixture)
 {
-    // õäöü in UTF-8
-    const fs::path namePath(u8"\u00f5\u00e4\u00f6\u00fc.txt");
+    // Include characters outside Windows-1252 to catch accidental ACP conversions.
+    const fs::path namePath(u8"\u00f5\u00e4\u00f6\u00fc-\u03b4-\u0436.txt");
     const fs::path src = tmpDataPath / namePath;
     std::ofstream(src) << "hello";
     BOOST_TEST_REQUIRE(fs::exists(src));