diff --git a/getpkg/test.sh b/getpkg/test.sh
index 35c5bf2..302127e 100755
--- a/getpkg/test.sh
+++ b/getpkg/test.sh
@@ -521,6 +521,11 @@ EOF
     else
         print_test_result "Complete uninstall removes all components" 1
     fi
+    
+    # Always cleanup test uninstall tool from server, even if test failed
+    if [[ "$PUBLISH_OUTPUT" =~ Published! ]]; then
+        $GETPKG unpublish "${TEST_UNINSTALL_TOOL}:${TEST_ARCH}" 2>/dev/null || true
+    fi
 fi
 
 # Test 14: Invalid tool name validation