diff --git a/manifests/cli/virt_who_configure.pp b/manifests/cli/virt_who_configure.pp
new file mode 100644
index 000000000..7a9438cd0
--- /dev/null
+++ b/manifests/cli/virt_who_configure.pp
@@ -0,0 +1,10 @@
+# = Hammer Virt Who Configure plugin
+#
+# This installs the Virt Who Configure plugin for Hammer CLI
+#
+# === Parameters:
+#
+class foreman::cli::virt_who_configure {
+  foreman::cli::plugin { 'foreman_virt_who_configure':
+  }
+}
diff --git a/manifests/plugin/virt_who_configure.pp b/manifests/plugin/virt_who_configure.pp
new file mode 100644
index 000000000..f7e0b5648
--- /dev/null
+++ b/manifests/plugin/virt_who_configure.pp
@@ -0,0 +1,5 @@
+# Installs foreman_virt_who_configure plugin
+class foreman::plugin::virt_who_configure {
+  foreman::plugin { 'virt_who_configure':
+  }
+}
diff --git a/spec/classes/foreman_cli_virt_who_configure_spec.rb b/spec/classes/foreman_cli_virt_who_configure_spec.rb
new file mode 100644
index 000000000..10201bbc0
--- /dev/null
+++ b/spec/classes/foreman_cli_virt_who_configure_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe 'foreman::cli::virt_who_configure' do
+  context 'on redhat-7-x86_64' do
+    let(:facts) do
+      on_supported_os['redhat-7-x86_64']
+    end
+
+    let(:pre_condition) { 'include foreman::cli' }
+
+    it { should contain_package('tfm-rubygem-hammer_cli_foreman_virt_who_configure') }
+  end
+
+  context 'on debian-9-x86_64' do
+    let(:facts) do
+      on_supported_os['debian-9-x86_64']
+    end
+
+    let(:pre_condition) { 'include foreman::cli' }
+
+    it { should contain_package('ruby-hammer-cli-foreman-virt-who-configure') }
+  end
+end
diff --git a/spec/classes/plugin/virt_who_configure_spec.rb b/spec/classes/plugin/virt_who_configure_spec.rb
new file mode 100644
index 000000000..a30fa03e1
--- /dev/null
+++ b/spec/classes/plugin/virt_who_configure_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'foreman::plugin::virt_who_configure' do
+  include_examples 'basic foreman plugin tests', 'virt_who_configure'
+end