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