diff --git a/.gitignore b/.gitignore
index dd887902ad..0e1d428ab0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -182,7 +182,7 @@
 /test-efi-disk.img
 /test-ellipsize
 /test-engine
-/test-env-replace
+/test-env-util
 /test-escape
 /test-event
 /test-execute
diff --git a/Makefile.am b/Makefile.am
index c2a82a5a35..350416af30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1421,7 +1421,7 @@ tests += \
 	test-watchdog \
 	test-cgroup-mask \
 	test-job-type \
-	test-env-replace \
+	test-env-util \
 	test-strbuf \
 	test-strv \
 	test-path \
@@ -2197,10 +2197,10 @@ test_cgroup_util_SOURCES = \
 test_cgroup_util_LDADD = \
 	libshared.la
 
-test_env_replace_SOURCES = \
-	src/test/test-env-replace.c
+test_env_util_SOURCES = \
+	src/test/test-env-util.c
 
-test_env_replace_LDADD = \
+test_env_util_LDADD = \
 	libshared.la
 
 test_strbuf_SOURCES = \
diff --git a/src/test/test-env-replace.c b/src/test/test-env-util.c
similarity index 100%
rename from src/test/test-env-replace.c
rename to src/test/test-env-util.c