diff --git a/stack.sh b/stack.sh
index 9cdf2648f1..217afbc2e3 100755
--- a/stack.sh
+++ b/stack.sh
@@ -194,6 +194,10 @@ if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
         yum_install ${RHEL6_EPEL_RPM} || \
             die $LINENO "Error installing EPEL repo, cannot continue"
     fi
+
+    # ... and also optional to be enabled
+    sudo yum-config-manager --enable rhel-6-server-optional-rpms
+
 fi
 
 
diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh
index 048024a325..47b0cd10cd 100755
--- a/tools/fixup_stuff.sh
+++ b/tools/fixup_stuff.sh
@@ -98,10 +98,6 @@ if [[ $DISTRO =~ (rhel6) ]]; then
         sudo setenforce 0
     fi
 
-    # make sure we have the "optional" repo enabled; it provides some
-    # packages like libffi-devel for example
-    sudo yum-config-manager --enable rhel-6-server-optional-rpms
-
     # If the ``dbus`` package was installed by DevStack dependencies the
     # uuid may not be generated because the service was never started (PR#598200),
     # causing Nova to stop later on complaining that ``/var/lib/dbus/machine-id``