diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh
index a6651075..b89ca15b 100755
--- a/.github/workflows/scripts/before_install.sh
+++ b/.github/workflows/scripts/before_install.sh
@@ -57,6 +57,7 @@ then
   export PULPCORE_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulpcore\/pull\/(\d+)' | awk -F'/' '{print $7}')
   export PULP_SMASH_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp-smash\/pull\/(\d+)' | awk -F'/' '{print $7}')
   export PULP_OPENAPI_GENERATOR_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp-openapi-generator\/pull\/(\d+)' | awk -F'/' '{print $7}')
+  export PULP_CLI_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp-cli\/pull\/(\d+)' | awk -F'/' '{print $7}')
   export PULP_FILE_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp_file\/pull\/(\d+)' | awk -F'/' '{print $7}')
   export PULP_CONTAINER_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp_container\/pull\/(\d+)' | awk -F'/' '{print $7}')
   export PULP_RPM_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp_rpm\/pull\/(\d+)' | awk -F'/' '{print $7}')
@@ -66,6 +67,7 @@ else
   export PULPCORE_PR_NUMBER=
   export PULP_SMASH_PR_NUMBER=
   export PULP_OPENAPI_GENERATOR_PR_NUMBER=
+  export PULP_CLI_PR_NUMBER=
   export PULP_FILE_PR_NUMBER=
   export PULP_CONTAINER_PR_NUMBER=
   export PULP_RPM_PR_NUMBER=
@@ -88,6 +90,21 @@ sed -i -e 's/localhost:24817/pulp/g' generate.sh
 sed -i -e 's/:24817/pulp/g' generate.sh
 cd ..
 
+
+git clone --depth=1 https://github.com/pulp/pulp-cli.git
+if [ -n "$PULP_CLI_PR_NUMBER" ]; then
+  cd pulp-cli
+  git fetch origin pull/$PULP_CLI_PR_NUMBER/head:$PULP_CLI_PR_NUMBER
+  git checkout $PULP_CLI_PR_NUMBER
+  cd ..
+fi
+
+cd pulp-cli
+pip install -e .
+pulp config create --base-url http://pulp --location tests/settings.toml
+cd ..
+
+
 git clone --depth=1 https://github.com/pulp/pulpcore.git --branch master
 
 cd pulpcore
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
index 1231e2ac..f11f65e1 100755
--- a/.github/workflows/scripts/script.sh
+++ b/.github/workflows/scripts/script.sh
@@ -34,7 +34,7 @@ if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]; then
   echo "Validating OpenAPI schema..."
   cat $PWD/.ci/scripts/schema.py | cmd_stdin_prefix bash -c "cat > /tmp/schema.py"
   cmd_prefix bash -c "python3 /tmp/schema.py"
-  # cmd_prefix bash -c "pulpcore-manager spectacular --file pulp_schema.yml --validate"
+  cmd_prefix bash -c "pulpcore-manager spectacular --file pulp_schema.yml --validate"
 
   if [ -f $POST_DOCS_TEST ]; then
     source $POST_DOCS_TEST
@@ -117,6 +117,9 @@ if [ -f $FUNC_TEST_SCRIPT ]; then
 else
     pytest -v -r sx --color=yes --pyargs pulp_2to3_migration.tests.functional
 fi
+pushd ../pulp-cli
+pytest -v -m pulp_2to3_migration
+popd
 
 if [ -f $POST_SCRIPT ]; then
   source $POST_SCRIPT
diff --git a/template_config.yml b/template_config.yml
index f3ad007e..4e8602b4 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -2,14 +2,14 @@
 # were not present before running plugin-template have been added with their default values.
 
 additional_plugins:
-- name: pulp_file
-  branch: master
-- name: pulp_container
-  branch: master
-- name: pulp_rpm
-  branch: master
-- name: pulp_deb
-  branch: main
+- branch: master
+  name: pulp_file
+- branch: master
+  name: pulp_container
+- branch: master
+  name: pulp_rpm
+- branch: main
+  name: pulp_deb
 black: false
 check_commit_message: true
 check_manifest: true
@@ -40,6 +40,7 @@ pydocstyle: false
 pypi_username: pulp
 redmine_project: migration
 test_bindings: false
+test_cli: true
 test_performance: false
 test_released_plugin_with_next_pulpcore_release: false
 test_s3: false