diff --git a/gbpservice/tests/contrib/gate_aim_hook.sh b/gbpservice/tests/contrib/gate_aim_hook.sh
index d6becd21a..07c4c1717 100644
--- a/gbpservice/tests/contrib/gate_aim_hook.sh
+++ b/gbpservice/tests/contrib/gate_aim_hook.sh
@@ -8,6 +8,9 @@ set -x
 
 trap prepare_logs ERR
 
+# temporary fix for bug 1693689
+export IPV4_ADDRS_SAFE_TO_USE=${DEVSTACK_GATE_IPV4_ADDRS_SAFE_TO_USE:-${DEVSTACK_GATE_FIXED_RANGE:-10.1.0.0/20}}
+
 prepare_gbp_aim_devstack
 FORCE=yes $TOP_DIR/stack.sh
 
diff --git a/gbpservice/tests/contrib/gate_hook.sh b/gbpservice/tests/contrib/gate_hook.sh
index 63a768d4b..23b9aa0e4 100644
--- a/gbpservice/tests/contrib/gate_hook.sh
+++ b/gbpservice/tests/contrib/gate_hook.sh
@@ -8,6 +8,9 @@ set -x
 
 trap prepare_logs ERR
 
+# temporary fix for bug 1693689
+export IPV4_ADDRS_SAFE_TO_USE=${DEVSTACK_GATE_IPV4_ADDRS_SAFE_TO_USE:-${DEVSTACK_GATE_FIXED_RANGE:-10.1.0.0/20}}
+
 prepare_gbp_devstack
 FORCE=yes $TOP_DIR/stack.sh
 
diff --git a/gbpservice/tests/contrib/gate_nfp_hook.sh b/gbpservice/tests/contrib/gate_nfp_hook.sh
index 1285f5ed8..8f68b95d2 100644
--- a/gbpservice/tests/contrib/gate_nfp_hook.sh
+++ b/gbpservice/tests/contrib/gate_nfp_hook.sh
@@ -11,6 +11,9 @@ set -x
 
 trap prepare_logs ERR
 
+# temporary fix for bug 1693689
+export IPV4_ADDRS_SAFE_TO_USE=${DEVSTACK_GATE_IPV4_ADDRS_SAFE_TO_USE:-${DEVSTACK_GATE_FIXED_RANGE:-10.1.0.0/20}}
+
 prepare_gbp_devstack
 prepare_nfp_devstack
 FORCE=yes $TOP_DIR/stack.sh