diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 71ca6075..e3804f6d 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -26,7 +26,7 @@ jobs:
 
     - name: Test FTP
       env:
-        FTP_CLIENT_TEST_SERVER_PATH: ${{github.workspace}}/test/ftp/server/server.py
+        FTP_CLIENT_TEST_SERVER_PATH: ${{github.workspace}}/test/server/server.py
       working-directory: ${{github.workspace}}/build/release/test
       run: ./ftp_test
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f0aa98a9..bc6b8093 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -26,7 +26,7 @@ jobs:
 
     - name: Test FTP
       env:
-        FTP_CLIENT_TEST_SERVER_PATH: ${{github.workspace}}/test/ftp/server/server.py
+        FTP_CLIENT_TEST_SERVER_PATH: ${{github.workspace}}/test/server/server.py
       working-directory: ${{github.workspace}}/build/release/test
       run: ./ftp_test
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 28b74495..85c2a6fb 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -49,7 +49,7 @@ jobs:
 
     - name: Test FTP
       env:
-        FTP_CLIENT_TEST_SERVER_PATH: ${{github.workspace}}\test\ftp\server\server.py
+        FTP_CLIENT_TEST_SERVER_PATH: ${{github.workspace}}\test\server\server.py
       working-directory: ${{github.workspace}}\build\test\Release
       run: .\ftp_test.exe
 
diff --git a/README.md b/README.md
index 318b7e17..53eeb6d4 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ cmake ..
 cmake --build .
 ```
 
-To run tests, set `FTP_CLIENT_TEST_SERVER_PATH` to the path to this [script](test/ftp/server/server.py).
+To run tests, set `FTP_CLIENT_TEST_SERVER_PATH` to the path to this [script](test/server/server.py).
 
 ```bash
 export FTP_CLIENT_TEST_SERVER_PATH="/path/to/server.py"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 379147cd..8f980063 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -21,14 +21,14 @@ enable_testing()
 
 # Tests.
 add_executable(ftp_test
-            ftp/ascii_istream.cpp
-            ftp/ascii_ostream.cpp
-            ftp/client.cpp
-            ftp/replies.cpp
-            ftp/reply.cpp
-            ftp/test_helpers.cpp
-            ftp/test_helpers.hpp
-            ftp/utils.cpp)
+            ascii_istream.cpp
+            ascii_ostream.cpp
+            client.cpp
+            replies.cpp
+            reply.cpp
+            test_helpers.cpp
+            test_helpers.hpp
+            utils.cpp)
 
 target_link_libraries(ftp_test
         PRIVATE
diff --git a/test/ftp/ascii_istream.cpp b/test/ascii_istream.cpp
similarity index 100%
rename from test/ftp/ascii_istream.cpp
rename to test/ascii_istream.cpp
diff --git a/test/ftp/ascii_ostream.cpp b/test/ascii_ostream.cpp
similarity index 100%
rename from test/ftp/ascii_ostream.cpp
rename to test/ascii_ostream.cpp
diff --git a/test/ftp/client.cpp b/test/client.cpp
similarity index 100%
rename from test/ftp/client.cpp
rename to test/client.cpp
diff --git a/test/ftp/replies.cpp b/test/replies.cpp
similarity index 100%
rename from test/ftp/replies.cpp
rename to test/replies.cpp
diff --git a/test/ftp/reply.cpp b/test/reply.cpp
similarity index 100%
rename from test/ftp/reply.cpp
rename to test/reply.cpp
diff --git a/test/ftp/server/pyftpdlib/__init__.py b/test/server/pyftpdlib/__init__.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/__init__.py
rename to test/server/pyftpdlib/__init__.py
diff --git a/test/ftp/server/pyftpdlib/__main__.py b/test/server/pyftpdlib/__main__.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/__main__.py
rename to test/server/pyftpdlib/__main__.py
diff --git a/test/ftp/server/pyftpdlib/_compat.py b/test/server/pyftpdlib/_compat.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/_compat.py
rename to test/server/pyftpdlib/_compat.py
diff --git a/test/ftp/server/pyftpdlib/authorizers.py b/test/server/pyftpdlib/authorizers.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/authorizers.py
rename to test/server/pyftpdlib/authorizers.py
diff --git a/test/ftp/server/pyftpdlib/filesystems.py b/test/server/pyftpdlib/filesystems.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/filesystems.py
rename to test/server/pyftpdlib/filesystems.py
diff --git a/test/ftp/server/pyftpdlib/handlers.py b/test/server/pyftpdlib/handlers.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/handlers.py
rename to test/server/pyftpdlib/handlers.py
diff --git a/test/ftp/server/pyftpdlib/ioloop.py b/test/server/pyftpdlib/ioloop.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/ioloop.py
rename to test/server/pyftpdlib/ioloop.py
diff --git a/test/ftp/server/pyftpdlib/log.py b/test/server/pyftpdlib/log.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/log.py
rename to test/server/pyftpdlib/log.py
diff --git a/test/ftp/server/pyftpdlib/prefork.py b/test/server/pyftpdlib/prefork.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/prefork.py
rename to test/server/pyftpdlib/prefork.py
diff --git a/test/ftp/server/pyftpdlib/servers.py b/test/server/pyftpdlib/servers.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/servers.py
rename to test/server/pyftpdlib/servers.py
diff --git a/test/ftp/server/pyftpdlib/test/README b/test/server/pyftpdlib/test/README
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/README
rename to test/server/pyftpdlib/test/README
diff --git a/test/ftp/server/pyftpdlib/test/__init__.py b/test/server/pyftpdlib/test/__init__.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/__init__.py
rename to test/server/pyftpdlib/test/__init__.py
diff --git a/test/ftp/server/pyftpdlib/test/__main__.py b/test/server/pyftpdlib/test/__main__.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/__main__.py
rename to test/server/pyftpdlib/test/__main__.py
diff --git a/test/ftp/server/pyftpdlib/test/keycert.pem b/test/server/pyftpdlib/test/keycert.pem
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/keycert.pem
rename to test/server/pyftpdlib/test/keycert.pem
diff --git a/test/ftp/server/pyftpdlib/test/runner.py b/test/server/pyftpdlib/test/runner.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/runner.py
rename to test/server/pyftpdlib/test/runner.py
diff --git a/test/ftp/server/pyftpdlib/test/test_authorizers.py b/test/server/pyftpdlib/test/test_authorizers.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/test_authorizers.py
rename to test/server/pyftpdlib/test/test_authorizers.py
diff --git a/test/ftp/server/pyftpdlib/test/test_filesystems.py b/test/server/pyftpdlib/test/test_filesystems.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/test_filesystems.py
rename to test/server/pyftpdlib/test/test_filesystems.py
diff --git a/test/ftp/server/pyftpdlib/test/test_functional.py b/test/server/pyftpdlib/test/test_functional.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/test_functional.py
rename to test/server/pyftpdlib/test/test_functional.py
diff --git a/test/ftp/server/pyftpdlib/test/test_functional_ssl.py b/test/server/pyftpdlib/test/test_functional_ssl.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/test_functional_ssl.py
rename to test/server/pyftpdlib/test/test_functional_ssl.py
diff --git a/test/ftp/server/pyftpdlib/test/test_ioloop.py b/test/server/pyftpdlib/test/test_ioloop.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/test_ioloop.py
rename to test/server/pyftpdlib/test/test_ioloop.py
diff --git a/test/ftp/server/pyftpdlib/test/test_misc.py b/test/server/pyftpdlib/test/test_misc.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/test_misc.py
rename to test/server/pyftpdlib/test/test_misc.py
diff --git a/test/ftp/server/pyftpdlib/test/test_servers.py b/test/server/pyftpdlib/test/test_servers.py
similarity index 100%
rename from test/ftp/server/pyftpdlib/test/test_servers.py
rename to test/server/pyftpdlib/test/test_servers.py
diff --git a/test/ftp/server/server.py b/test/server/server.py
similarity index 100%
rename from test/ftp/server/server.py
rename to test/server/server.py
diff --git a/test/ftp/test_helpers.cpp b/test/test_helpers.cpp
similarity index 100%
rename from test/ftp/test_helpers.cpp
rename to test/test_helpers.cpp
diff --git a/test/ftp/test_helpers.hpp b/test/test_helpers.hpp
similarity index 100%
rename from test/ftp/test_helpers.hpp
rename to test/test_helpers.hpp
diff --git a/test/ftp/utils.cpp b/test/utils.cpp
similarity index 100%
rename from test/ftp/utils.cpp
rename to test/utils.cpp
diff --git a/util/unix/build.sh b/util/unix/build.sh
index 7a7bdf7b..25fb2ab0 100755
--- a/util/unix/build.sh
+++ b/util/unix/build.sh
@@ -40,6 +40,6 @@ cmake -S "${PROJECT_DIR}" -B "${BUILD_DIR}" -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
 cmake --build "${BUILD_DIR}"
 
 if [[ ${RUN_TEST} == "ON" ]]; then
-    export FTP_CLIENT_TEST_SERVER_PATH="${PROJECT_DIR}/test/ftp/server/server.py"
+    export FTP_CLIENT_TEST_SERVER_PATH="${PROJECT_DIR}/test/server/server.py"
     ctest --test-dir "${BUILD_DIR}/test" --verbose
 fi
\ No newline at end of file
diff --git a/util/windows/build.ps1 b/util/windows/build.ps1
index 2978f91b..0b1a4b4f 100644
--- a/util/windows/build.ps1
+++ b/util/windows/build.ps1
@@ -24,7 +24,7 @@ cmake --build $buildDir --config $BuildType
 
 if ($RunTest)
 {
-    $env:FTP_CLIENT_TEST_SERVER_PATH = Join-Path $projectDir "test\ftp\server\server.py"
+    $env:FTP_CLIENT_TEST_SERVER_PATH = Join-Path $projectDir "test\server\server.py"
     $testDir = Join-Path $buildDir "test"
     ctest --test-dir $testDir --build-config $BuildType --verbose
 }
\ No newline at end of file