diff --git a/test/completion/puppet.exp b/test/completion/puppet.exp
new file mode 100644
index 00000000..28463445
--- /dev/null
+++ b/test/completion/puppet.exp
@@ -0,0 +1 @@
+assert_source_completions puppet
diff --git a/test/lib/completions/puppet.exp b/test/lib/completions/puppet.exp
new file mode 100644
index 00000000..7b7da3e7
--- /dev/null
+++ b/test/lib/completions/puppet.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "puppet "
+
+
+sync_after_int
+
+
+teardown