diff --git a/scripts/clmc-service/install-clmc-service.sh b/scripts/clmc-service/install-clmc-service.sh
index ff396fc2f1b958235742d3e248b7d7df0d842e67..d2d45d527357f5f70ef08e6ee4f74a38876d6506 100755
--- a/scripts/clmc-service/install-clmc-service.sh
+++ b/scripts/clmc-service/install-clmc-service.sh
@@ -112,8 +112,8 @@ chmod 755 $start_script_file
 file="/lib/systemd/system/flameclmc.service"
 echo "[Unit]" > $file
 echo "Description=flameclmc" >> $file
-echo "After=flame-fqdn-registration.service" >> $file
-echo "Requires=flame-fqdn-registration.service" >> $file
+echo "After=${NETWORK_DEPENDENCY}" >> $file
+echo "Requires=${NETWORK_DEPENDENCY}" >> $file
 echo "" >> $file
 echo "[Service]" >> $file
 echo "Type=forking" >> $file
diff --git a/scripts/clmc-service/install.sh b/scripts/clmc-service/install.sh
index e3e059135cbfde46f5ceeb5babe66c0e384025fd..973e67e55f4c821f1cb8ad04aebd52066110b8d3 100755
--- a/scripts/clmc-service/install.sh
+++ b/scripts/clmc-service/install.sh
@@ -32,6 +32,11 @@ if [[ -z "${SFEMC_FQDN}" ]]; then
 	exit 1
 fi
 
+if [[ -z "${NETWORK_DEPENDENCY}" ]]; then
+    echo "Failed: cannot find NETWORK_DEPENDENCY environment variable."
+	exit 1
+fi
+
 # Ensure everything runs in directory of the parent script
 cd `dirname $0`
 
diff --git a/scripts/test/fixture.sh b/scripts/test/fixture.sh
index 72f3de47e9194256cbb629146a0d391017e47854..a7165742181b29ad435ee8da14e2c25173e7944b 100755
--- a/scripts/test/fixture.sh
+++ b/scripts/test/fixture.sh
@@ -53,7 +53,7 @@ create() {
         if [ ${service_name} == "clmc-service" ]; then
             cmd="${target_root}/scripts/clmc-service/install.sh"
             echo "Provisioning command ${cmd}"
-            lxc exec ${service_name} --env REPO_ROOT=${target_root} --env SFEMC_FQDN="sfemc.localhost" -- ${cmd}
+            lxc exec ${service_name} --env REPO_ROOT=${target_root} --env SFEMC_FQDN="sfemc.localhost" --env NETWORK_DEPENDENCY="network.target"-- ${cmd}
             exit_code=$?
             if [ $exit_code != 0 ]; then
                 echo "clmc-service installation failed with exit code ${exit_code}"