diff --git a/manifests/type.pp b/manifests/type.pp
index 612efeca..42d79346 100644
--- a/manifests/type.pp
+++ b/manifests/type.pp
@@ -66,7 +66,7 @@ define cinder::type (
 
   exec {"cinder type-create ${volume_name}":
     command     => "cinder type-create ${volume_name}",
-    unless      => "cinder type-list | grep -qP '\\b${volume_name}\\b'",
+    unless      => "cinder type-list | grep -qP '\\s${volume_name}\\s'",
     environment => concat($cinder_env, $region_env),
     require     => Package['python-cinderclient'],
     path        => ['/usr/bin', '/bin'],
diff --git a/spec/defines/cinder_type_spec.rb b/spec/defines/cinder_type_spec.rb
index 6fb84845..67388a82 100644
--- a/spec/defines/cinder_type_spec.rb
+++ b/spec/defines/cinder_type_spec.rb
@@ -24,7 +24,7 @@ describe 'cinder::type' do
         'OS_USERNAME=admin',
         'OS_PASSWORD=asdf',
         'OS_AUTH_URL=http://127.127.127.1:5000/v2.0/'],
-      :unless    => "cinder type-list | grep -qP '\\bhippo\\b'",
+      :unless    => "cinder type-list | grep -qP '\\shippo\\s'",
       :tries     => '2',
       :try_sleep => '5',
       :require => 'Package[python-cinderclient]')