diff --git a/devstack/settings b/devstack/settings
index c23806b36..d7a458a07 100755
--- a/devstack/settings
+++ b/devstack/settings
@@ -31,7 +31,7 @@ GBPHEAT_BRANCH=${GBPHEAT_BRANCH:-master}
 AIM_BRANCH=${AIM_BRANCH:-master}
 APICML2_BRANCH=${APICML2_BRANCH:-master}
 OPFLEX_BRANCH=${OPFLEX_BRANCH:-master}
-APICAPI_BRANCH=${APICAPI_BRANCH:-aci_integration_manager}
+APICAPI_BRANCH=${APICAPI_BRANCH:-master}
 
 # Enable necessary services, including group-policy (and disable others)
 disable_service n-net
diff --git a/test-requirements.txt b/test-requirements.txt
index d995c7f81..bf7cf0f1a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,8 +4,7 @@
 
 -e git+https://git.openstack.org/openstack/neutron.git@stable/newton#egg=neutron
 
-# TODO(rkukura): Switch apicapi back to master branch eventually.
--e git+https://github.com/noironetworks/apicapi.git@aci_integration_manager#egg=apicapi
+-e git+https://github.com/noironetworks/apicapi.git@master#egg=apicapi
 
 -e git+https://github.com/noironetworks/python-opflex-agent.git@master#egg=python-opflexagent-agent
 -e git+https://github.com/noironetworks/apic-ml2-driver.git@master#egg=apic_ml2