diff --git a/test/generate b/test/generate
index deeba05a52b..49f0b368e2f 100755
--- a/test/generate
+++ b/test/generate
@@ -1,64 +1,19 @@
 #!/bin/bash -eu
-# Generate skeleton files for completion of specified command.
-# Test skeleton files are generated as well.
-# @param $1 string  Command, e.g. 'make'
-# @param $2 string  Completion function, e.g. _command
-# @param $3 string  Completion arguments, e.g. '-o filenames'
-
-
-# Generate test code
-# @param $1 string  Command, e.g. 'make'
-generate_test_completion() {
-    local path="completion/$1.exp"
-            # Does file already exist?
-    #if [ ! -f "$path" ]; then
-            # No, file doesn't exist; generate file
-    cat <<EXPECT > "$path"
-assert_source_completions $1
-EXPECT
-    #fi
-} # generate_test_completion()
-
-
-# Generate test code
-# @param $1 string  Command, e.g. 'make'
-# @param $2 string  Completion function, e.g. _command
-# @param $3 string  Completion arguments, e.g. ' -o filenames'
-generate_test_lib_completions() {
-    local path="lib/completions/$1.exp"
-            # Does file already exist?
-    #if [ ! -f "$path" ]; then
-            # No, file doesn't exist; generate file
-    cat <<EXPECT > "$path"
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
 
-setup
-
-
-assert_complete_any "$1 "
-sync_after_int
+# Generate skeleton files for completion of specified command.
 
+if [[ $# -ne 1 ]]; then
+    echo "Usage: $0 command" >&2
+    exit 1
+fi
 
-teardown
-EXPECT
-    #fi
-} # generate_test_lib_completions()
+cat <<EOF >t/test_$1.py
+import pytest
 
 
-        # If argument count is wrong, show help
-if [ $# -ne 1 ]; then
-    echo "Usage: $0 command"
-    echo "Example: $0 make"
-    exit 1
-fi
+class Test(object):
 
-generate_test_completion "$1"
-generate_test_lib_completions "$1"
+    @pytest.mark.complete("$1 ")
+    def test_(self, completion):
+        assert completion.list
+EOF