diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 2a0f5aa7..913322d3 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -36,9 +36,13 @@ neutron_distro_packages:
   - iputils
   - keepalived
   - net-tools
+  - python-keystoneclient
   - radvd
   - which
 
+neutron_devel_distro_packages:
+  - python-httplib2
+
 neutron_service_distro_packages:
   - python-cliff
   - python-keystonemiddleware
@@ -47,7 +51,6 @@ neutron_service_distro_packages:
   - openstack-neutron-macvtap-agent
   - openstack-neutron-l2gw-agent
   - python-glanceclient
-  - python-keystoneclient
   - python-memcached
   - python-neutronclient
   - python-novaclient
diff --git a/vars/source_install.yml b/vars/source_install.yml
index a246a45f..63ae9402 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -43,12 +43,11 @@ neutron_package_list: |-
   {% if neutron_developer_mode | bool %}
   {%   set _ = packages.extend(neutron_developer_mode_distro_packages) %}
   {% endif %}
+  {% set _ = packages.extend(neutron_devel_distro_packages) %}
   {{ packages }}
 
 neutron_requires_pip_packages:
   - virtualenv
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-  - httplib2
 
 neutron_pip_packages:
   - cliff
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 51c1b5ba..fb2296ec 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -47,9 +47,13 @@ neutron_distro_packages:
   - iputils
   - keepalived
   - net-tools
+  - python-keystoneclient
   - radvd
   - which
 
+neutron_devel_distro_packages:
+  - python-httplib2
+
 neutron_service_distro_packages:
   - python-cliff
   - python-keystonemiddleware
@@ -57,7 +61,6 @@ neutron_service_distro_packages:
   - openstack-neutron-server
   - openstack-neutron-dhcp-agent
   - python-glanceclient
-  - python-keystoneclient
   - python-memcached
   - python-neutronclient
   - python-novaclient
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index f20c05cf..a1387e08 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -45,8 +45,12 @@ neutron_distro_packages:
   - iputils-arping
   - net-tools
   - keepalived
+  - python-keystoneclient
   - radvd
 
+neutron_devel_distro_packages:
+  - python-httplib2
+
 neutron_service_distro_packages:
   - python-cliff
   - python-keystonemiddleware
@@ -58,7 +62,6 @@ neutron_service_distro_packages:
   - neutron-metadata-agent
   - neutron-plugin-ml2
   - python-glanceclient
-  - python-keystoneclient
   - python-memcache
   - python-neutronclient
   - python-novaclient