diff --git a/src/libutil/url-name.cc b/src/libexpr/flake/url-name.cc
similarity index 100%
rename from src/libutil/url-name.cc
rename to src/libexpr/flake/url-name.cc
diff --git a/src/libutil/url-name.hh b/src/libexpr/flake/url-name.hh
similarity index 100%
rename from src/libutil/url-name.hh
rename to src/libexpr/flake/url-name.hh
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index 1d89815e2..abd56e4f4 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -11,7 +11,7 @@
 #include "profiles.hh"
 #include "names.hh"
 #include "url.hh"
-#include "url-name.hh"
+#include "flake/url-name.hh"
 
 #include <nlohmann/json.hpp>
 #include <regex>
diff --git a/tests/unit/libexpr/flakeref.cc b/tests/unit/libexpr/flake/flakeref.cc
similarity index 100%
rename from tests/unit/libexpr/flakeref.cc
rename to tests/unit/libexpr/flake/flakeref.cc
diff --git a/tests/unit/libutil/url-name.cc b/tests/unit/libexpr/flake/url-name.cc
similarity index 99%
rename from tests/unit/libutil/url-name.cc
rename to tests/unit/libexpr/flake/url-name.cc
index f637efa89..84d32837c 100644
--- a/tests/unit/libutil/url-name.cc
+++ b/tests/unit/libexpr/flake/url-name.cc
@@ -1,4 +1,4 @@
-#include "url-name.hh"
+#include "flake/url-name.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libexpr/local.mk b/tests/unit/libexpr/local.mk
index 5743880d7..25810ad9c 100644
--- a/tests/unit/libexpr/local.mk
+++ b/tests/unit/libexpr/local.mk
@@ -16,7 +16,8 @@ endif
 
 libexpr-tests_SOURCES := \
     $(wildcard $(d)/*.cc) \
-    $(wildcard $(d)/value/*.cc)
+    $(wildcard $(d)/value/*.cc) \
+    $(wildcard $(d)/flake/*.cc)
 
 libexpr-tests_EXTRA_INCLUDES = \
     -I tests/unit/libexpr-support \