diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp
new file mode 100644
index 000000000..39cbf9e60
--- /dev/null
+++ b/manifests/vncproxy.pp
@@ -0,0 +1,10 @@
+class nova::vncproxy(
+) {
+
+  Package['nova-vncproxy'] -> Exec<| title == 'initial-db-sync' |>
+
+  package { 'nova-vncproxy':
+    ensure => present,
+  }
+
+}
diff --git a/spec/classes/nova_vnc_proxy_spec.rb b/spec/classes/nova_vnc_proxy_spec.rb
new file mode 100644
index 000000000..075c57482
--- /dev/null
+++ b/spec/classes/nova_vnc_proxy_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe 'nova::vncproxy' do
+
+  let :pre_condition do
+    'include nova'
+  end
+
+  describe 'on debian platforms' do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+
+    it { should contain_package('nova-vncproxy').with(
+      'ensure' => 'present',
+      'before' => nil
+    )}
+    describe 'when deployed on the API server' do
+      let :pre_condition do
+        'include nova::api'
+      end
+      it { should contain_package('nova-vncproxy').with(
+        'ensure' => 'present',
+        'before' => 'Exec[initial-db-sync]'
+      )}
+    end
+  end
+end