diff --git a/.github/actions/registry-diff/action.yml b/.github/actions/registry-diff/action.yml
index e89e5fc74a..6c10bc8119 100644
--- a/.github/actions/registry-diff/action.yml
+++ b/.github/actions/registry-diff/action.yml
@@ -19,8 +19,9 @@ runs:
     - id: diff
       shell: bash
       run: |
-        # Get modified registry files and extract tool names
-        modified=$(git diff --name-only ${{ inputs.base_sha }} HEAD -- 'registry/*.toml' \
+        # Get added/modified registry files and extract tool names
+        # (deleted files are excluded — they can't be tested)
+        modified=$(git diff --name-only --diff-filter=AM ${{ inputs.base_sha }} HEAD -- 'registry/*.toml' \
           | xargs -I{} basename {} .toml \
           | tr '\n' ' ')
 
diff --git a/.github/workflows/registry.yml b/.github/workflows/registry.yml
index 9beaec6376..5b19656f7e 100644
--- a/.github/workflows/registry.yml
+++ b/.github/workflows/registry.yml
@@ -88,6 +88,7 @@ jobs:
     outputs:
       tools: ${{ steps.determine-tools.outputs.tools }}
       tranches: ${{ steps.determine-tools.outputs.tranches }}
+      skip-test-tool: ${{ steps.determine-tools.outputs.skip-test-tool }}
       new_tools: ${{ steps.registry-diff.outputs.new_tools }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -114,9 +115,14 @@ jobs:
 
           tools="${{ steps.registry-diff.outputs.modified_tools }}"
           count=$(echo "$tools" | wc -w)
-          echo "Modified tools count: $(echo "$tools" | wc -w)"
+          echo "Modified tools count: $count"
 
-          if [ "$count" -ge 64 ]; then
+          if [ "$count" -eq 0 ]; then
+            echo "No tools added or modified (deletion-only PR), skipping test-tool"
+            echo "tools=" >> "$GITHUB_OUTPUT"
+            echo "tranches=0" >> "$GITHUB_OUTPUT"
+            echo "skip-test-tool=true" >> "$GITHUB_OUTPUT"
+          elif [ "$count" -ge 64 ]; then
             echo "64 or more tools updated, splitting changed tools across 8 tranches"
             echo "tools=$tools" >> "$GITHUB_OUTPUT"
             echo "tranches=8" >> "$GITHUB_OUTPUT"
@@ -164,7 +170,8 @@ jobs:
       !cancelled() &&
       needs.build.result == 'success' &&
       (needs.list-changed-tools.result == 'success' || needs.list-changed-tools.result == 'skipped') &&
-      (needs.validate-new-tools.result == 'success' || needs.validate-new-tools.result == 'skipped')
+      (needs.validate-new-tools.result == 'success' || needs.validate-new-tools.result == 'skipped') &&
+      needs.list-changed-tools.outputs.skip-test-tool != 'true'
     strategy:
       fail-fast: false
       matrix:
@@ -371,7 +378,9 @@ jobs:
             echo "validate-new-tools failed - new tools must include tests"
             exit 1
           fi
-          if [ "${{ needs.test-tool.result }}" != "success" ]; then
+          if [ "${{ needs.list-changed-tools.outputs.skip-test-tool }}" == "true" ]; then
+            echo "test-tool intentionally skipped (deletion-only PR)"
+          elif [ "${{ needs.test-tool.result }}" != "success" ]; then
             echo "test-tool failed or was skipped"
             exit 1
           fi
diff --git a/registry/bosh-backup-and-restore.toml b/registry/bosh-backup-and-restore.toml
deleted file mode 100644
index 974c9ba183..0000000000
--- a/registry/bosh-backup-and-restore.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-aliases = ["bbr"]
-description = "BOSH Backup and Restore is a CLI utility for orchestrating the backup and restore of BOSH deployments and BOSH directors"
-os = ["linux", "macos"]
-test = { cmd = "bosh-backup-and-restore version", expected = "bbr version {{version}}" }
-
-[[backends]]
-full = "github:cloudfoundry-incubator/bosh-backup-and-restore"
-
-[backends.options]
-asset_pattern = "bbr-*-{darwin_os}-{amd64_arch}"
-bin = "bosh-backup-and-restore"
-
-[[backends]]
-full = "asdf:mise-plugins/tanzu-plug-in-for-asdf"
diff --git a/registry/brig.toml b/registry/brig.toml
deleted file mode 100644
index 7ffb5005b0..0000000000
--- a/registry/brig.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:brigadecore/brigade", "asdf:Ibotta/asdf-brig"]
-description = "Brigade CLI. Event-driven scripting for Kubernetes"
-test = { cmd = "brig version", expected = "Brigade client: version v{{version}}" }
diff --git a/registry/btrace.toml b/registry/btrace.toml
deleted file mode 100644
index ef73c84235..0000000000
--- a/registry/btrace.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["github:btraceio/btrace", "asdf:mise-plugins/mise-btrace"]
-description = "BTrace - a safe, dynamic tracing tool for the Java platform"
-test = { cmd = "env JAVA_HOME=/usr/lib/jvm/default-java btrace --version", expected = "BTrace v.{{version}}" }
diff --git a/registry/carp.toml b/registry/carp.toml
deleted file mode 100644
index f423cebb7a..0000000000
--- a/registry/carp.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-description = "Carp Language"
-
-[[backends]]
-full = "github:carp-lang/Carp"
-
-[backends.options]
-exe = "carp"
-
-[[backends]]
-full = "asdf:susurri/asdf-carp"
diff --git a/registry/clarinet.toml b/registry/clarinet.toml
deleted file mode 100644
index 83a1391efa..0000000000
--- a/registry/clarinet.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-backends = ["github:hirosystems/clarinet", "asdf:alexgo-io/asdf-clarinet"]
-description = "Write, test and deploy high-quality smart contracts to the Stacks blockchain and Bitcoin"
-os = ["linux", "macos"]
-test = { cmd = "clarinet --version", expected = "clarinet {{version}}" }
diff --git a/registry/cli53.toml b/registry/cli53.toml
deleted file mode 100644
index 7d99d47f4f..0000000000
--- a/registry/cli53.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:barnybug/cli53"]
-description = "Command line tool for Amazon Route 53"
-test = { cmd = "cli53 --version", expected = "cli53 version {{version}}" }
diff --git a/registry/concourse.toml b/registry/concourse.toml
deleted file mode 100644
index 1078665920..0000000000
--- a/registry/concourse.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-backends = [
-  "aqua:concourse/concourse/concourse",
-  "asdf:mattysweeps/asdf-concourse",
-]
-description = "Concourse is a container-based automation system written in Go"
diff --git a/registry/conduit.toml b/registry/conduit.toml
deleted file mode 100644
index 76858c4c2b..0000000000
--- a/registry/conduit.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["github:ConduitIO/conduit", "asdf:gmcabrita/asdf-conduit"]
-description = "Conduit streams data between data stores. Kafka Connect replacement. No JVM required"
-test = { cmd = "conduit --version", expected = "v{{version}}" }
diff --git a/registry/copper.toml b/registry/copper.toml
deleted file mode 100644
index 25e54a8b18..0000000000
--- a/registry/copper.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-backends = ["aqua:cloud66-oss/copper", "asdf:vladlosev/asdf-copper"]
-description = "A configuration file validator for Kubernetes"
-os = ["linux", "macos"]
-test = { cmd = "copper version", expected = "" }
diff --git a/registry/credhub.toml b/registry/credhub.toml
deleted file mode 100644
index 17fa589623..0000000000
--- a/registry/credhub.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-backends = [
-  "aqua:cloudfoundry/credhub-cli",
-  "asdf:mise-plugins/tanzu-plug-in-for-asdf",
-]
-description = "CredHub CLI provides a command line interface to interact with CredHub servers"
-test = { cmd = "credhub --version", expected = "CLI Version: {{version}}" }
diff --git a/registry/datree.toml b/registry/datree.toml
deleted file mode 100644
index 997cedae70..0000000000
--- a/registry/datree.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:datreeio/datree", "asdf:lukeab/asdf-datree"]
-description = "Prevent Kubernetes misconfigurations from reaching production (again  )! From code to cloud, Datree provides an E2E policy enforcement solution to run automatic checks for rule violations. See our docs: https://hub.datree.io"
diff --git a/registry/djinni.toml b/registry/djinni.toml
deleted file mode 100644
index 0743084a5a..0000000000
--- a/registry/djinni.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-description = "Command-line tool that generates gluecode from a djinni-IDL file"
-test = { cmd = "djinni --version", expected = "djinni generator version {{version}}" }
-
-[[backends]]
-full = "github:cross-language-cpp/djinni-generator"
-
-[backends.options]
-asset_pattern = "djinni"
-bin = "djinni"
-
-[[backends]]
-full = "asdf:cross-language-cpp/asdf-djinni"
diff --git a/registry/dome.toml b/registry/dome.toml
deleted file mode 100644
index 3f293273a2..0000000000
--- a/registry/dome.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-description = "DOME is a framework for making 2D games using the Wren programming language which can be played across platforms"
-os = ["linux", "macos", "windows"]
-
-[[backends]]
-full = "github:domeengine/dome"
-
-[backends.options.platforms.macos-x64]
-asset_pattern = "dome-v{{ version }}-macosx-all.zip"
-bin_path = "dome-macosx-all"
-
-[backends.options.platforms.macos-arm64]
-asset_pattern = "dome-v{{ version }}-macosx-all.zip"
-bin_path = "dome-macosx-all"
-
-[backends.options.platforms.linux-x64]
-asset_pattern = "dome-v{{ version }}-linux-x64.zip"
-bin_path = "dome-linux-x64"
-
-[backends.options.platforms.windows-x64]
-asset_pattern = "dome-v{{ version }}-windows-x64.zip"
-bin_path = "dome-windows-x64"
-
-[[backends]]
-full = "asdf:mise-plugins/mise-dome"
diff --git a/registry/draft.toml b/registry/draft.toml
deleted file mode 100644
index df04f1a9a0..0000000000
--- a/registry/draft.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:Azure/draft", "asdf:kristoflemmens/asdf-draft"]
-description = "A day 0 tool for getting your app on k8s fast"
diff --git a/registry/dtm.toml b/registry/dtm.toml
deleted file mode 100644
index 9f57082827..0000000000
--- a/registry/dtm.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-description = "DevStream: the open-source DevOps toolchain manager (DTM)"
-
-[[backends]]
-full = "github:devstream-io/devstream"
-
-[backends.options]
-exe = "dtm"
-
-[[backends]]
-full = "asdf:zhenyuanlau/asdf-dtm"
diff --git a/registry/envcli.toml b/registry/envcli.toml
deleted file mode 100644
index e3e706e43f..0000000000
--- a/registry/envcli.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:EnvCLI/EnvCLI", "asdf:zekker6/asdf-envcli"]
-description = "Don't install Node, Go, ... locally - use containers you define within your project. If you have a new machine / other contributors you just have to install docker and envcli to get started"
-test = { cmd = "envcli --version", expected = "EnvCLI version {{version}}" }
diff --git a/registry/esy.toml b/registry/esy.toml
deleted file mode 100644
index 7559ab67aa..0000000000
--- a/registry/esy.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["npm:esy"]
-description = "Easy package management for native Reason, OCaml and more"
-test = { cmd = "esy --version", expected = "{{version}}" }
diff --git a/registry/glen.toml b/registry/glen.toml
deleted file mode 100644
index 5ef2518583..0000000000
--- a/registry/glen.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["github:lingrino/glen", "asdf:bradym/asdf-glen"]
-description = "cli to export gitlab variables"
-test = { cmd = "glen version", expected = "{{version}}" }
diff --git a/registry/grain.toml b/registry/grain.toml
deleted file mode 100644
index d79937b3e3..0000000000
--- a/registry/grain.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-description = "The Grain compiler toolchain and CLI. Home of the modern web staple"
-test = { cmd = "grain --version", expected = "{{version}}" }
-
-[[backends]]
-full = "github:grain-lang/grain"
-
-[backends.options]
-version_prefix = "grain-v"
-
-[[backends]]
-full = "asdf:mise-plugins/mise-grain"
diff --git a/registry/inlets.toml b/registry/inlets.toml
deleted file mode 100644
index 0aa2efc716..0000000000
--- a/registry/inlets.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:inlets/inletsctl", "asdf:nlamirault/asdf-inlets"]
-description = "Create inlets servers on the top cloud platforms"
diff --git a/registry/kcctl.toml b/registry/kcctl.toml
deleted file mode 100644
index d6bf91a540..0000000000
--- a/registry/kcctl.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["github:kcctl/kcctl", "asdf:joschi/asdf-kcctl"]
-description = "A modern and intuitive command line client for Kafka Connect"
diff --git a/registry/ki.toml b/registry/ki.toml
deleted file mode 100644
index 19796b1057..0000000000
--- a/registry/ki.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:Kotlin/kotlin-interactive-shell", "asdf:comdotlinux/asdf-ki"]
-description = "Kotlin Language Interactive Shell"
-test = { cmd = "ki --version", expected = "{{version}}" }
diff --git a/registry/kpack.toml b/registry/kpack.toml
deleted file mode 100644
index e56ca46602..0000000000
--- a/registry/kpack.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-aliases = ["kp"]
-description = "A command line interface for interacting with kpack"
-test = { cmd = "kp version", expected = "{{version}}" }
-
-[[backends]]
-full = "github:vmware-tanzu/kpack-cli"
-
-[backends.options]
-exe = "kp"
-
-[[backends]]
-full = "asdf:asdf-community/asdf-kpack-cli"
diff --git a/registry/krab.toml b/registry/krab.toml
deleted file mode 100644
index 0de7084dee..0000000000
--- a/registry/krab.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:ohkrab/krab", "asdf:ohkrab/asdf-krab"]
-description = "Krab is a migration and automation tool for PostgreSQL based on HCL syntax"
-test = { cmd = "krab --version", expected = "{{version}}" }
diff --git a/registry/kube-credential-cache.toml b/registry/kube-credential-cache.toml
deleted file mode 100644
index 7d0b16d852..0000000000
--- a/registry/kube-credential-cache.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-backends = [
-  "aqua:ryodocx/kube-credential-cache",
-  "asdf:ryodocx/kube-credential-cache",
-]
-description = "Accelerator cache for kubernetes access"
diff --git a/registry/kubefedctl.toml b/registry/kubefedctl.toml
deleted file mode 100644
index 0341b67154..0000000000
--- a/registry/kubefedctl.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:kubernetes-retired/kubefed", "asdf:kvokka/asdf-kubefedctl"]
-description = "kubefedctl controls a Kubernetes Cluster Federation"
-test = { cmd = "kubefedctl version", expected = "kubefedctl version:" } # may not have version in output
diff --git a/registry/kubefirst.toml b/registry/kubefirst.toml
deleted file mode 100644
index 4c162715dc..0000000000
--- a/registry/kubefirst.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["github:konstructio/kubefirst", "asdf:Claywd/asdf-kubefirst"]
-description = "The Kubefirst CLI creates instant GitOps platforms that integrate some of the best tools in cloud native from scratch in minutes"
diff --git a/registry/kubemqctl.toml b/registry/kubemqctl.toml
deleted file mode 100644
index 5adea8443e..0000000000
--- a/registry/kubemqctl.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:kubemq-io/kubemqctl", "asdf:johnlayton/asdf-kubemqctl"]
-description = "Kubemqctl is a command line interface (CLI) for KubeMQ, Kubernetes Message Broker"
diff --git a/registry/kwt.toml b/registry/kwt.toml
deleted file mode 100644
index bcd6026747..0000000000
--- a/registry/kwt.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:carvel-dev/kwt", "asdf:vmware-tanzu/asdf-carvel"]
-description = "Kubernetes Workstation Tools CLI"
diff --git a/registry/lab.toml b/registry/lab.toml
deleted file mode 100644
index afa0c5334e..0000000000
--- a/registry/lab.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:zaquestion/lab", "asdf:particledecay/asdf-lab"]
-description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"
diff --git a/registry/lane.toml b/registry/lane.toml
deleted file mode 100644
index 0766e7f532..0000000000
--- a/registry/lane.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["github:CodeReaper/lane", "asdf:CodeReaper/asdf-lane"]
-description = "lane is a task automation helper"
diff --git a/registry/levant.toml b/registry/levant.toml
deleted file mode 100644
index 33eb5ce4d5..0000000000
--- a/registry/levant.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:hashicorp/levant", "asdf:mise-plugins/mise-hashicorp"]
-description = "An open source templating and deployment tool for HashiCorp Nomad jobs"
diff --git a/registry/melt.toml b/registry/melt.toml
deleted file mode 100644
index dcae5990d6..0000000000
--- a/registry/melt.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["github:charmbracelet/melt", "asdf:chessmango/asdf-melt"]
-description = "Backup and restore Ed25519 SSH keys with seed words 🫠"
diff --git a/registry/opsgenie-lamp.toml b/registry/opsgenie-lamp.toml
deleted file mode 100644
index 096698fea1..0000000000
--- a/registry/opsgenie-lamp.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-description = "OpsGenie Lamp with Go SDK"
-test = { cmd = "opsgenie-lamp --version", expected = "lamp version " } # 3.1.4 reports 3.2.0
-
-[[backends]]
-full = "github:opsgenie/opsgenie-lamp"
-
-[backends.options]
-bin = "opsgenie-lamp"
-
-[[backends]]
-full = "asdf:mise-plugins/mise-opsgenie-lamp"
diff --git a/registry/pachctl.toml b/registry/pachctl.toml
deleted file mode 100644
index b769bc7d19..0000000000
--- a/registry/pachctl.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:pachyderm/pachyderm", "asdf:abatilo/asdf-pachctl"]
-description = "Data-Centric Pipelines and Data Versioning"
-test = { cmd = "pachctl help", expected = "" } # version subcommand fails with invalid configuration
diff --git a/registry/psc-package.toml b/registry/psc-package.toml
deleted file mode 100644
index 703eb32b0e..0000000000
--- a/registry/psc-package.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["github:purescript/psc-package", "asdf:nsaunders/asdf-psc-package"]
-description = "A package manager for PureScript based on package sets"
diff --git a/registry/purerl.toml b/registry/purerl.toml
deleted file mode 100644
index 17bd4f946b..0000000000
--- a/registry/purerl.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["github:purerl/purerl", "asdf:GoNZooo/asdf-purerl"]
-description = "Erlang backend for the PureScript compiler"
diff --git a/registry/redo.toml b/registry/redo.toml
deleted file mode 100644
index 1cde293593..0000000000
--- a/registry/redo.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:barthr/redo", "asdf:chessmango/asdf-redo"]
-description = "Redo is the ultimate tool to create reusable functions from your history in an interactive way"
-test = { cmd = "which redo", expected = "redo" }
diff --git a/registry/rke.toml b/registry/rke.toml
deleted file mode 100644
index 0433783379..0000000000
--- a/registry/rke.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:rancher/rke", "asdf:particledecay/asdf-rke"]
-description = "Rancher Kubernetes Engine (RKE), an extremely simple, lightning fast Kubernetes distribution that runs entirely within containers"
diff --git a/registry/sinker.toml b/registry/sinker.toml
deleted file mode 100644
index cecc080cc9..0000000000
--- a/registry/sinker.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:plexsystems/sinker", "asdf:elementalvoid/asdf-sinker"]
-description = "A tool to sync images from one container registry to another"
diff --git a/registry/soracom.toml b/registry/soracom.toml
deleted file mode 100644
index 4de0ce81b6..0000000000
--- a/registry/soracom.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["github:soracom/soracom-cli", "asdf:gr1m0h/asdf-soracom"]
-description = "Provides `soracom` command, a command line tool for calling SORACOM APIs"
diff --git a/registry/starboard.toml b/registry/starboard.toml
deleted file mode 100644
index 12b568a5ba..0000000000
--- a/registry/starboard.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-backends = [
-  "aqua:aquasecurity/starboard",
-  "asdf:zufardhiyaulhaq/asdf-starboard",
-]
-description = "Kubernetes-native security toolkit"
diff --git a/registry/sver.toml b/registry/sver.toml
deleted file mode 100644
index d003a6534e..0000000000
--- a/registry/sver.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["aqua:mitoma/sver", "asdf:robzr/asdf-sver"]
-description = "Version generator based on source code"
diff --git a/registry/terradozer.toml b/registry/terradozer.toml
deleted file mode 100644
index 27d1a2531f..0000000000
--- a/registry/terradozer.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["github:chenrui333/terradozer"]
-description = "Terraform destroy without configuration files"
-os = ["linux", "macos"]
diff --git a/registry/titan.toml b/registry/titan.toml
deleted file mode 100644
index 660018e40b..0000000000
--- a/registry/titan.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-backends = ["github:titan-data/titan", "asdf:gabitchov/asdf-titan"]
-description = "Titan is an open source project for developers to manage their data like code"
diff --git a/registry/uaa.toml b/registry/uaa.toml
deleted file mode 100644
index 1373d838ee..0000000000
--- a/registry/uaa.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-aliases = ["uaa-cli"]
-backends = [
-  "aqua:cloudfoundry/uaa-cli",
-  "asdf:mise-plugins/tanzu-plug-in-for-asdf",
-]
-description = "CLI for UAA written in Go"
-test = { cmd = "uaa version", expected = "{{version}}" }
diff --git a/registry/wasm4.toml b/registry/wasm4.toml
deleted file mode 100644
index f240a8f3ad..0000000000
--- a/registry/wasm4.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["aqua:aduros/wasm4", "asdf:jtakakura/asdf-wasm4"]
-description = "Build retro games using WebAssembly for a fantasy console"
-test = { cmd = "w4 --version", expected = "{{version}}" }
diff --git a/registry/wren.toml b/registry/wren.toml
deleted file mode 100644
index 1813218b23..0000000000
--- a/registry/wren.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-aliases = ["wren-cli"]
-backends = ["aqua:wren-lang/wren-cli", "asdf:jtakakura/asdf-wren-cli"]
-description = "A command line tool for the Wren programming language"
-test = { cmd = "wren_cli --version", expected = "wren {{version}}" }
diff --git a/registry/zbctl.toml b/registry/zbctl.toml
deleted file mode 100644
index 32ff90effc..0000000000
--- a/registry/zbctl.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-backends = ["npm:zbctl"]
-description = "zbctl is a command line interface designed to create and read resources inside zeebe broker."
-test = { cmd = "zbctl version", expected = "zbctl {{version}}" }