diff --git a/.kitchen.yml b/.kitchen.yml
index 5b99df5..5c0604d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -79,9 +79,9 @@ suites:
       # NOTE: block-storage, orchestration, dashboard, etc. can be installed
       #       but are not tested by tempest
       - recipe[openstack-block-storage::api]
-      - recipe[openstack-block-storage::scheduler]
       - recipe[openstack-block-storage::volume_driver_lvm]
       - recipe[openstack-block-storage::volume]
+      - recipe[openstack-block-storage::scheduler]
       - recipe[openstack-block-storage::backup]
       - recipe[openstack-block-storage::identity_registration]
       - recipe[openstack-bare-metal::api]
@@ -116,6 +116,11 @@ suites:
       yum:
         epel:
           enabled: false
+      poise-python:
+        options:
+          pip_version: '18.0'
+          setuptools_version: '40.0.0'
+          wheel_version: '0.31.1'
       openstack:
         is_release: true
         apt:
diff --git a/roles/allinone.json b/roles/allinone.json
index 5eecdd2..5f03bd6 100644
--- a/roles/allinone.json
+++ b/roles/allinone.json
@@ -2,7 +2,6 @@
   "name": "allinone",
   "description": "This will deploy all of the services for Openstack Compute to function on a single box.",
   "run_list": [
-    "recipe[build-essential]",
     "recipe[openstack-common]",
     "recipe[openstack-common::logging]",
     "recipe[openstack-common::sysctl]",
diff --git a/roles/multinode-compute.json b/roles/multinode-compute.json
index 49b5962..74010ff 100644
--- a/roles/multinode-compute.json
+++ b/roles/multinode-compute.json
@@ -2,7 +2,6 @@
   "name": "multinode-compute",
   "description": "This will deploy a compute node for a scenarios with just compute and controller nodes",
   "run_list": [
-    "recipe[build-essential]",
     "recipe[openstack-common]",
     "recipe[openstack-compute::compute]",
     "recipe[openstack-compute::identity_registration]",
diff --git a/roles/multinode-controller.json b/roles/multinode-controller.json
index 2deaa34..2a88390 100644
--- a/roles/multinode-controller.json
+++ b/roles/multinode-controller.json
@@ -2,7 +2,6 @@
   "name": "multinode-controller",
   "description": "This will deploy a controller node for a scenarios with just compute and controller nodes",
   "run_list": [
-    "recipe[build-essential]",
     "recipe[openstack-common]",
     "recipe[openstack-common::logging]",
     "recipe[openstack-common::sysctl]",
diff --git a/roles/multinode-network.json b/roles/multinode-network.json
index 3b7cc7c..47a4f41 100644
--- a/roles/multinode-network.json
+++ b/roles/multinode-network.json
@@ -2,7 +2,6 @@
   "name": "multinode-network",
   "description": "This will deploy a controller node for a scenarios with just compute and controller nodes",
   "run_list": [
-    "recipe[build-essential]",
     "recipe[openstack-common]",
     "recipe[openstack-common::logging]",
     "recipe[openstack-common::sysctl]",
@@ -12,4 +11,4 @@
     "recipe[openstack-network::metadata_agent]",
     "recipe[openstack-network::openvswitch_agent]"
   ]
-}
\ No newline at end of file
+}