2 files changed, 22 insertions, 2 deletions
diff --git a/tests/path/buildfile b/tests/path/buildfile
index e7f19f2..aa39b2d 100644
--- a/tests/path/buildfile
+++ b/tests/path/buildfile
@@ -4,4 +4,10 @@
 
 import libs = libbutl%lib{butl}
 
+if ($cxx.features.modules && ($force_std_modules == true || $cxx.id != 'msvc'))
+{
+  import libs += libstd-modules%liba{std-modules}
+  cxx.poptions += -D__cpp_lib_modules
+}
+
 exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/path/driver.cxx b/tests/path/driver.cxx
index 4d859b3..c2919c0 100644
--- a/tests/path/driver.cxx
+++ b/tests/path/driver.cxx
@@ -3,11 +3,25 @@
 // license   : MIT; see accompanying LICENSE file
 
 #include <cassert>
+
+#ifndef __cpp_lib_modules
 #include <iostream>
 #include <type_traits>
+#endif
+
+// Other includes.
 
-#include <libbutl/path.hxx>
-#include <libbutl/path-io.hxx>
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.path;
+import butl.path_io;
+#else
+#include <libbutl/path.mxx>
+#include <libbutl/path-io.mxx>
+#endif
 
 using namespace std;
 using namespace butl;