diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..4cc0a9b
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  PHPUnit:
+    name: PHPUnit (PHP ${{ matrix.php }})
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        php:
+          - 5.4
+          - 5.3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+          ini-file: development
+      - run: composer install
+      - run: vendor/bin/phpunit --coverage-text
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 2af5cf5..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-language: php
-php:
-  - 5.4
-  - 5.3
-before_script:
-  - composer install --dev --prefer-source --no-interaction
-script:
-  - phpunit --coverage-text
diff --git a/README.md b/README.md
index ea36a67..7713acb 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # clue/redis-protocol [![Build Status](https://travis-ci.org/clue/php-redis-protocol.png?branch=master)](https://travis-ci.org/clue/php-redis-protocol)
 
+[![CI status](https://github.com/clue/php-redis-protocol/actions/workflows/ci.yml/badge.svg)](https://github.com/clue/php-redis-protocol/actions)
+
 A streaming redis protocol parser and serializer written in PHP 
 
 This parser and serializer implementation allows you to parse redis protocol
diff --git a/composer.json b/composer.json
index d99e2ee..eef3ef1 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,17 @@
     "require": {
         "php": ">=5.3"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8.36"
+    },
     "autoload": {
-        "psr-0": { "Clue\\Redis\\Protocol": "src" }
+        "psr-4": {
+            "Clue\\Redis\\Protocol\\": "src/Clue/Redis/Protocol/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Clue\\Tests\\Redis\\Protocol\\": "tests/"
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4f3de2a..f66a042 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
+<!-- PHPUnit configuration file with old format for legacy PHPUnit -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
     <testsuites>
         <testsuite name="Redis Protocol Test Suite">
             <directory>./tests/</directory>
@@ -16,4 +15,7 @@
             <directory>./src/</directory>
         </whitelist>
     </filter>
-</phpunit>
\ No newline at end of file
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+</phpunit>
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
index b669223..e25c810 100644
--- a/tests/FactoryTest.php
+++ b/tests/FactoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol;
+
 use Clue\Redis\Protocol\Factory;
 
 class FactoryTest extends TestCase
diff --git a/tests/Model/AbstractModelTest.php b/tests/Model/AbstractModelTest.php
index 1358533..ceb326f 100644
--- a/tests/Model/AbstractModelTest.php
+++ b/tests/Model/AbstractModelTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Serializer\RecursiveSerializer;
+use Clue\Tests\Redis\Protocol\TestCase;
 
 abstract class AbstractModelTest extends TestCase
 {
diff --git a/tests/Model/BulkReplyTest.php b/tests/Model/BulkReplyTest.php
index 78ed04c..a5a63eb 100644
--- a/tests/Model/BulkReplyTest.php
+++ b/tests/Model/BulkReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\BulkReply;
 
 class BulkReplyTest extends AbstractModelTest
diff --git a/tests/Model/ErrorReplyTest.php b/tests/Model/ErrorReplyTest.php
index 2585b08..7380898 100644
--- a/tests/Model/ErrorReplyTest.php
+++ b/tests/Model/ErrorReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\ErrorReply;
 
 class ErrorReplyTest extends AbstractModelTest
diff --git a/tests/Model/IntegerReplyTest.php b/tests/Model/IntegerReplyTest.php
index f6a2e10..c90080f 100644
--- a/tests/Model/IntegerReplyTest.php
+++ b/tests/Model/IntegerReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\IntegerReply;
 
 class IntegerReplyTest extends AbstractModelTest
diff --git a/tests/Model/MultiBulkReplyTest.php b/tests/Model/MultiBulkReplyTest.php
index 04dd389..36051a9 100644
--- a/tests/Model/MultiBulkReplyTest.php
+++ b/tests/Model/MultiBulkReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\MultiBulkReply;
 use Clue\Redis\Protocol\Model\BulkReply;
 use Clue\Redis\Protocol\Model\IntegerReply;
diff --git a/tests/Model/RequestTest.php b/tests/Model/RequestTest.php
index 6719481..a327529 100644
--- a/tests/Model/RequestTest.php
+++ b/tests/Model/RequestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\Request;
 
 class RequestTest extends AbstractModelTest
diff --git a/tests/Model/StatusReplyTest.php b/tests/Model/StatusReplyTest.php
index 8debd85..7b218aa 100644
--- a/tests/Model/StatusReplyTest.php
+++ b/tests/Model/StatusReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\StatusReply;
 
 class StatusReplyTest extends AbstractModelTest
diff --git a/tests/Parser/AbstractParserTest.php b/tests/Parser/AbstractParserTest.php
index 3d45c20..b4df7c7 100644
--- a/tests/Parser/AbstractParserTest.php
+++ b/tests/Parser/AbstractParserTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Parser\ParserInterface;
 use Clue\Redis\Protocol\Parser\MessageBuffer;
+use Clue\Tests\Redis\Protocol\TestCase;
 
 abstract class AbstractParserTest extends TestCase
 {
diff --git a/tests/Parser/RequestParserTest.php b/tests/Parser/RequestParserTest.php
index 645b673..64aee17 100644
--- a/tests/Parser/RequestParserTest.php
+++ b/tests/Parser/RequestParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Parser\RequestParser;
 
 class RequestParserTest extends AbstractParserTest
diff --git a/tests/Parser/ResponseParserTest.php b/tests/Parser/ResponseParserTest.php
index 762c8bd..8f87090 100644
--- a/tests/Parser/ResponseParserTest.php
+++ b/tests/Parser/ResponseParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Parser\ResponseParser;
 
 class RecursiveParserTest extends AbstractParserTest
diff --git a/tests/Serializer/AbstractSerializerTest.php b/tests/Serializer/AbstractSerializerTest.php
index ba2200a..242c612 100644
--- a/tests/Serializer/AbstractSerializerTest.php
+++ b/tests/Serializer/AbstractSerializerTest.php
@@ -1,8 +1,9 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Serializer;
+
 use Clue\Redis\Protocol\Serializer\SerializerInterface;
-use Clue\Redis\Protocol\Model\Status;
-use Clue\Redis\Protocol\Model\ErrorReplyException;
+use Clue\Tests\Redis\Protocol\TestCase;
 //use Exception;
 
 abstract class AbstractSerializerTest extends TestCase
@@ -85,10 +86,10 @@ public function testArrayMultiBulkReply()
 
     public function testErrorReply()
     {
-        $model = $this->serializer->createReplyModel(new Exception('ERR failure'));
+        $model = $this->serializer->createReplyModel(new \Exception('ERR failure'));
         $this->assertInstanceOf('Clue\Redis\Protocol\Model\ErrorReply', $model);
         $this->assertEquals('ERR failure', $model->getValueNative());
-        $this->assertEquals($model->getMessageSerialized($this->serializer), $this->serializer->getReplyMessage(new Exception('ERR failure')));
+        $this->assertEquals($model->getMessageSerialized($this->serializer), $this->serializer->getReplyMessage(new \Exception('ERR failure')));
     }
 
     /**
diff --git a/tests/Serializer/RecursiveSerializerTest.php b/tests/Serializer/RecursiveSerializerTest.php
index fe62ac5..e991b86 100644
--- a/tests/Serializer/RecursiveSerializerTest.php
+++ b/tests/Serializer/RecursiveSerializerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Serializer;
+
 use Clue\Redis\Protocol\Serializer\RecursiveSerializer;
 
 class RecursiveSerializerTest extends AbstractSerializerTest
diff --git a/tests/TestCase.php b/tests/TestCase.php
new file mode 100644
index 0000000..15188a9
--- /dev/null
+++ b/tests/TestCase.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Clue\Tests\Redis\Protocol;
+
+class TestCase extends \PHPUnit_Framework_TestCase
+{
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 0b2ea18..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-(include_once __DIR__ . '/../vendor/autoload.php') OR die(PHP_EOL . 'ERROR: composer autoloader not found, run "composer install" or see README for instructions' . PHP_EOL);
-
-class TestCase extends PHPUnit_Framework_TestCase
-{
-}