diff --git a/cluster/saltbase/pillar/mine.sls b/cluster/saltbase/pillar/mine.sls
index 874dafc3e35..45035e47957 100644
--- a/cluster/saltbase/pillar/mine.sls
+++ b/cluster/saltbase/pillar/mine.sls
@@ -1,6 +1,6 @@
+{% if grains.cloud is defined and grains.cloud == 'gce' -%}
 # On GCE, there is no Salt mine. We run standalone.
-{% if grains.cloud != 'gce' -%}
-
+{% else %}
 # Allow everyone to see cached values of who sits at what IP
 {% set networkInterfaceName = "eth0" %}
 {% if grains.networkInterfaceName is defined %}
@@ -9,5 +9,4 @@
 mine_functions:
   network.ip_addrs: [{{networkInterfaceName}}]
   grains.items: []
-
 {% endif -%}
diff --git a/cluster/vagrant/provision-minion.sh b/cluster/vagrant/provision-minion.sh
index a9401c80fb4..8749021b3fb 100755
--- a/cluster/vagrant/provision-minion.sh
+++ b/cluster/vagrant/provision-minion.sh
@@ -64,6 +64,7 @@ EOF
 # Our minions will have a pool role to distinguish them from the master.
 cat <<EOF >/etc/salt/minion.d/grains.conf
 grains:
+  cloud: vagrant
   network_mode: openvswitch
   node_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
   etcd_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'