diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 20128915..d8ed592a 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -201,10 +201,6 @@ export DEVSTACK_CINDER_SECURE_DELETE=${DEVSTACK_CINDER_SECURE_DELETE:-0}
 # Only applicable to master branch
 export DEVSTACK_GATE_NEUTRON=${DEVSTACK_GATE_NEUTRON:-0}
 
-# Set to 1 to run neutron with features that make it unstable
-# TODO(armax): get rid of this if as soon as bugs #1464612 and #1432189 get resolved
-export DEVSTACK_GATE_NEUTRON_UNSTABLE=${DEVSTACK_GATE_NEUTRON_UNSTABLE:-0}
-
 # Set to 1 to run neutron distributed virtual routing
 export DEVSTACK_GATE_NEUTRON_DVR=${DEVSTACK_GATE_NEUTRON_DVR:-0}
 
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index c5f3092c..56d81142 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -212,11 +212,6 @@ function setup_localrc {
     if [[ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]]; then
         echo "Q_USE_DEBUG_COMMAND=True" >>"$localrc_file"
         echo "NETWORK_GATEWAY=10.1.0.1" >>"$localrc_file"
-        # TODO(armax): get rid of this if as soon as bugs #1464612 and #1432189 get resolved
-        if [[ "$DEVSTACK_GATE_NEUTRON_UNSTABLE" -eq "0" ]]; then
-            echo "MYSQL_DRIVER=MySQL-python" >>"$localrc_file"
-            echo "API_WORKERS=0" >>"$localrc_file"
-        fi
     fi
 
     if [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq "1" ]]; then