diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d0f060d79555f1ddd4f744a56414637a1987685f..4258c8d51c9e1246251416cfb08713bd5512ef85 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2019-01-09  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/libstdc++-prettyprinters/cxx17.cc: Fix expected output
+	for filesystem::path. Give variables more distinctive names.
+
 	* include/std/optional (_Optional_payload_base::_M_copy_assign): New
 	member function to perform non-trivial assignment.
 	(_Optional_payload_base::_M_move_assign): Likewise.
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc
index c550cbd61bd56a542c51c30c2417365e301f7c44..4ed4d47240f82d1776d29e157c1e59326f2251ff 100644
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc
@@ -124,12 +124,12 @@ main()
 // { dg-final { regexp-test q {std::shared_ptr.int \[2\]. \(use count 2, weak count 1\) = {get\(\) = 0x.*}} } }
 // { dg-final { regexp-test wq {std::weak_ptr.int \[2\]. \(use count 2, weak count 1\) = {get\(\) = 0x.*}} } }
 
-  std::filesystem::path p0;
-// { dg-final { note-test p0 {filesystem::path ""} } }
-  std::filesystem::path p1("filename");
-// { dg-final { note-test p1 {filesystem::path "filename"} } }
-  std::filesystem::path p2("/dir/.");
-// { dg-final { note-test p2 {filesystem::path "/dir/file" = {[root-directory] = "/", [1] = "dir", [2] = "."}} } }
+  std::filesystem::path path0;
+// { dg-final { note-test path0 {filesystem::path ""} } }
+  std::filesystem::path path1("filename");
+// { dg-final { note-test path1 {filesystem::path "filename"} } }
+  std::filesystem::path path2("/dir/.");
+// { dg-final { note-test path2 {filesystem::path "/dir/." = {[root-directory] = "/", [1] = "dir", [2] = "."}} } }
 
   std::cout << "\n";
   return 0;			// Mark SPOT