diff --git a/WINDOWS.md b/WINDOWS.md
index feb867772c..885b964680 100644
--- a/WINDOWS.md
+++ b/WINDOWS.md
@@ -19,7 +19,7 @@ PHP-Version requirements are marked using `[ ]`
     setx path "%path%;c:\path-to-php\"
     ```
 - [Install PHP SDK for PHP 5.6](http://windows.php.net/downloads/php-sdk/)(Currently `php-sdk-binary-tools-20110915.zip` is the newest)
-- [Install PHP SDK for PHP 7.0+](https://github.com/Microsoft/php-sdk-binary-tools/releases) 
+- [Install PHP SDK for PHP 7.0+](https://github.com/Microsoft/php-sdk-binary-tools/releases)
 ```cmd
 setx php_sdk "c:\path-to-php-sdk"
 ```
@@ -41,7 +41,7 @@ composer install
 
 ## Installation of Zephir Parser
 
-1. Download [Zephir Parser for Windows](https://github.com/phalcon/php-zephir-parser/releases/latest)
+1. Download [Zephir Parser for Windows](https://github.com/zephir-lang/php-zephir-parser/releases/latest)
 2. Extract the DLL file and copy it to your PHP extensions directory
 3. Edit your `php.ini` file and add this line:
    ```ini
@@ -51,7 +51,7 @@ composer install
    extension=zephir_parser.dll
    ```
 
-**NOTE**: Also you can [compile it yourself.](https://github.com/phalcon/php-zephir-parser/blob/master/README.WIN32-BUILD-SYSTEM)
+**NOTE**: Also you can [compile it yourself.](https://github.com/zephir-lang/php-zephir-parser/blob/master/README.WIN32-BUILD-SYSTEM)
 
 ## Usage of Zephir
 
diff --git a/phpunit b/phpunit
deleted file mode 100755
index 3b109670c5..0000000000
--- a/phpunit
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/*
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/66ffffcd8a6bb23aec847c8bdfb918610399499a
-
-if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
-    echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
-    echo "Please run `composer update` before running this command.\n";
-    exit(1);
-}
-
-if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
-    putenv('SYMFONY_PHPUNIT_VERSION=6.5');
-}
-
-putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
-require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';
diff --git a/tests/Extension/ConstantsTest.php b/tests/Extension/ConstantsTest.php
index b4560a6e53..d8bbf9a965 100644
--- a/tests/Extension/ConstantsTest.php
+++ b/tests/Extension/ConstantsTest.php
@@ -87,11 +87,6 @@ public function testMagickConstants(): void
     }
 
     /**
-     * Test Constant declaration as String.
-     *
-     * @author Alexnder Andriiako <AlexNDR@phalconphp.com>
-     *
-     * @since 2017-08-09
      * @issue https://github.com/zephir-lang/zephir/issues/1571
      */
     public function testStringDelimiterAsConstDoubleQuoted(): void
diff --git a/tests/sharness/t0005-stubs.sh b/tests/sharness/t0005-stubs.sh
index 086aa412f2..ba60aa92d9 100755
--- a/tests/sharness/t0005-stubs.sh
+++ b/tests/sharness/t0005-stubs.sh
@@ -58,7 +58,7 @@ test_expect_success "Should properly generate Aliases for use statements" \
   "test_cmp expected/$expected ide/0.0.1/Stubs/Issue_1986.zep.php"
 
 # See: https://github.com/zephir-lang/zephir/issues/1896
-test_expect_success "Should generage CamelCase folders for stubs" \
+test_expect_success "Should generate CamelCase folders for stubs" \
   "test $(ls ./ide/0.0.1/Stubs/Events/ManagerInterface.zep.php | sed -e 's~\/~\\~g') = .\ide\0.0.1\Stubs\Events\ManagerInterface.zep.php"
 
 # See: https://github.com/zephir-lang/zephir/issues/2026