diff --git a/.github/actions/prepare_snap7/action.yml b/.github/actions/prepare_snap7/action.yml
new file mode 100644
index 00000000..02884990
--- /dev/null
+++ b/.github/actions/prepare_snap7/action.yml
@@ -0,0 +1,41 @@
+name: 'prepare to build a package'
+description: 'Downloads and unpacks snap7 archive. Copies the required files. Updates wheels'
+inputs:
+  snap7-archive-url:
+    description: 'Link to download snap7 archive'
+    required: true
+    default: 'https://sourceforge.net/projects/snap7/files/1.4.2/snap7-full-1.4.2.7z/download'
+runs:
+  using: "composite"
+  steps:
+      - name: Cache snap7-archive
+        id: snap7-archive
+        uses: actions/cache@v3
+        with:
+          path: snap7-full-1.4.2.7z
+          key: ${{ inputs.snap7-archive-url }}
+      
+      - name: Install choco packages
+        if: steps.snap7-archive.outputs.cache-hit != 'true' && runner.os == 'Windows'
+        shell: bash
+        run: choco install --allow-downgrade wget --version 1.20.3.20190531
+
+      - name: Get snap7
+        if: steps.snap7-archive.outputs.cache-hit != 'true'
+        shell: bash
+        run: wget -O snap7-full-1.4.2.7z --content-disposition -c ${{ inputs.snap7-archive-url }}
+
+      - name: Extract archive
+        shell: bash
+        run: 7z x snap7-full-1.4.2.7z
+
+      - name: Copy files
+        shell: bash
+        run: |
+          mkdir src
+          cp snap7-full-1.4.2/release/Wrappers/c-cpp/snap7.h src
+          cp .github/build_scripts/dummy.c ./
+
+      - name: Update wheel
+        shell: bash
+        run: python -m pip install --upgrade pip wheel
\ No newline at end of file
diff --git a/.github/workflows/build-and-test-arm32v7.yml b/.github/workflows/build-and-test-arm32v7.yml
index 7af77205..3920fc36 100644
--- a/.github/workflows/build-and-test-arm32v7.yml
+++ b/.github/workflows/build-and-test-arm32v7.yml
@@ -4,8 +4,6 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
-env:
-  snap7-archive-url: https://sourceforge.net/projects/snap7/files/1.4.2/snap7-full-1.4.2.7z/download
 jobs:
   arm32-build:
     name: Build arm32 wheel
@@ -13,37 +11,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
-      - name: Cache snap7-archive
-        id: snap7-archive
-        uses: actions/cache@v3
-        with:
-          path: snap7-full-1.4.2.7z
-          key: ${{ env.snap7-archive-url }}
-
-      - name: Get snap7
-        if: steps.snap7-archive.outputs.cache-hit != 'true'
-        run: |
-          wget -O snap7-full-1.4.2.7z --content-disposition -c ${{ env.snap7-archive-url }}
-
-      - name: Extract archive
-        run: 7z x snap7-full-1.4.2.7z
-
-      - name: Copy files
-        run: |
-          mkdir src
-          cp snap7-full-1.4.2/release/Wrappers/c-cpp/snap7.h src
-          cp .github/build_scripts/dummy.c ./
-          ls snap7-full-1.4.2
+      
+      - name: prepare snap7 archive
+        uses: ./.github/actions/prepare_snap7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
         with:
           platforms: arm
 
-      - name: Update wheel
-        run: python -m pip install --upgrade wheel
-
       - name: Build libsnap7.so
         run: |
           docker run --rm --interactive -v $PWD/snap7-full-1.4.2:/snap7-full-1.4.2 "arm32v7/gcc:latest" /bin/bash -s <<EOF 
@@ -51,9 +27,6 @@ jobs:
           make -f arm_v7_linux.mk all
           EOF
 
-      - name: tmp check file
-        run: ls -la snap7-full-1.4.2/build/bin/arm_v7-linux
-
       - name: Build pure python wheel
         run: python3 setup.py bdist_wheel --plat-name=linux_armv7l
 
@@ -68,7 +41,6 @@ jobs:
           mkdir -p wheelhouse/linux_armv7l
           python3 -m wheel pack $unpack_tmp_dir/$packagename -d wheelhouse/linux_armv7l/
 
-
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -99,7 +71,8 @@ jobs:
 
       - name: Run tests in docker:arm32v7
         run: |
-          docker run --platform linux/arm/v7 --rm --interactive -v $PWD/test:/test -v $PWD/wheelhouse:/wheelhouse "arm32v7/python:${{ matrix.python-version }}-buster" /bin/bash -s <<EOF 
-          python -m pip install pytest $(ls wheelhouse/linux_armv7l/*.whl)
-          python -m pytest test/test_server.py test/test_util.py test/test_client.py test/test_mainloop.py test/test_partner.py
+          docker run --platform linux/arm/v7 --rm --interactive -v $PWD/tests:/tests -v $PWD/setup.cfg:/setup.cfg \
+            -v $PWD/wheelhouse:/wheelhouse "arm32v7/python:${{ matrix.python-version }}-buster" /bin/bash -s <<EOF 
+          python -m pip install pytest pytest-asyncio $(ls wheelhouse/linux_armv7l/*.whl)
+          python -m pytest tests/ -m "server or util or client or mainloop or partner"
           EOF
diff --git a/.github/workflows/build-and-test-arm64.yml b/.github/workflows/build-and-test-arm64.yml
index 88d7cf7e..1e12fd79 100644
--- a/.github/workflows/build-and-test-arm64.yml
+++ b/.github/workflows/build-and-test-arm64.yml
@@ -4,8 +4,6 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
-env:
-  snap7-archive-url: https://sourceforge.net/projects/snap7/files/1.4.2/snap7-full-1.4.2.7z/download
 jobs:
   arm64-build:
     name: Build arm64 wheel
@@ -13,27 +11,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
-      - name: Cache snap7-archive
-        id: snap7-archive
-        uses: actions/cache@v3
-        with:
-          path: snap7-full-1.4.2.7z
-          key: ${{ env.snap7-archive-url }}
-
-      - name: Get snap7
-        if: steps.snap7-archive.outputs.cache-hit != 'true'
-        run: |
-          wget -O snap7-full-1.4.2.7z --content-disposition -c ${{ env.snap7-archive-url }}
-
-      - name: Extract archive
-        run: 7z x snap7-full-1.4.2.7z
+      
+      - name: prepare snap7 archive
+        uses: ./.github/actions/prepare_snap7
 
       - name: Copy files
         run: |
-          mkdir src
-          cp snap7-full-1.4.2/release/Wrappers/c-cpp/snap7.h src
-          cp .github/build_scripts/dummy.c ./
           cp .github/build_scripts/aarch64-linux-gnu.mk snap7-full-1.4.2/build/unix/
 
       - name: Set up QEMU
@@ -41,9 +24,6 @@ jobs:
         with:
           platforms: arm64
 
-      - name: Update wheel
-        run: python -m pip install --upgrade wheel
-
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.1.3
         with:
@@ -72,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -90,7 +70,8 @@ jobs:
 
       - name: Run tests in docker:arm64v8
         run: |
-          docker run --rm --interactive -v $PWD/test:/test -v $PWD/wheelhouse:/wheelhouse "arm64v8/python:${{ matrix.python-version }}-buster" /bin/bash -s <<EOF 
-          python -m pip install pytest $(ls wheelhouse/${{ runner.os }}/*.whl)
-          python -m pytest test/test_server.py test/test_util.py test/test_client.py test/test_mainloop.py test/test_partner.py
+          docker run --rm --interactive -v $PWD/tests:/tests -v $PWD/setup.cfg:/setup.cfg -v $PWD/wheelhouse:/wheelhouse \
+            "arm64v8/python:${{ matrix.python-version }}-buster" /bin/bash -s <<EOF 
+          python3 -m pip install pytest pytest-asyncio $(ls wheelhouse/${{ runner.os }}/*.whl)
+          python3 -m pytest tests/ -m server -m util -m client -m mainloop -m partner
           EOF
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 76c9ed05..be4f64bf 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -4,8 +4,6 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
-env:
-  snap7-archive-url: https://sourceforge.net/projects/snap7/files/1.4.2/snap7-full-1.4.2.7z/download
 jobs:
   windows-build:
     name: Build wheel for windows
@@ -14,26 +12,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install choco packages
-        run: choco install --allow-downgrade wget --version 1.20.3.20190531
-
-      - name: Cache snap7-archive
-        id: snap7-archive
-        uses: actions/cache@v3
-        with:
-          path: snap7-full-1.4.2.7z
-          key: ${{ env.snap7-archive-url }}
-
-      - name: Get snap7
-        if: steps.snap7-archive.outputs.cache-hit != 'true'
-        run: |
-          wget -O snap7-full-1.4.2.7z --content-disposition -c ${{ env.snap7-archive-url }}
-
-      - name: Extract archive
-        run: 7z x snap7-full-1.4.2.7z
-
-      - name: Update wheel
-        run: python3 -m pip install wheel --upgrade
+      - name: prepare snap7 archive
+        uses: ./.github/actions/prepare_snap7
 
       - name: Build wheel
         run: python3 setup.py bdist_wheel --plat-name win_amd64
@@ -54,28 +34,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Cache snap7-archive
-        id: snap7-archive
-        uses: actions/cache@v3
-        with:
-          path: snap7-full-1.4.2.7z
-          key: ${{ env.snap7-archive-url }}
-
-      - name: Get snap7
-        if: steps.snap7-archive.outputs.cache-hit != 'true'
-        run: wget -O snap7-full-1.4.2.7z --content-disposition -c ${{ env.snap7-archive-url }}
-
-      - name: Extract archive
-        run: 7z x snap7-full-1.4.2.7z
-
-      - name: Copy files
-        run: |
-          mkdir src
-          cp snap7-full-1.4.2/release/Wrappers/c-cpp/snap7.h src
-          cp .github/build_scripts/dummy.c ./
-      
-      - name: Update wheel
-        run: python -m pip install --upgrade wheel
+      - name: prepare snap7 archive
+        uses: ./.github/actions/prepare_snap7
 
       - name: Build pure python wheel
         run: python3 setup.py bdist_wheel --plat-name=manylinux1_x86_64
@@ -105,27 +65,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
-      - name: Cache snap7-archive
-        id: snap7-archive
-        uses: actions/cache@v3
-        with:
-          path: snap7-full-1.4.2.7z
-          key: ${{ env.snap7-archive-url }}
-
-      - name: Get snap7
-        if: steps.snap7-archive.outputs.cache-hit != 'true'
-        run: |
-          wget -nv -O snap7-full-1.4.2.7z --content-disposition -c ${{ env.snap7-archive-url }}
-
-      - name: Extract archive
-        run: 7z x snap7-full-1.4.2.7z
+      
+      - name: prepare snap7 archive
+        uses: ./.github/actions/prepare_snap7
 
       - name: Copy files
         run: |
-          mkdir src
-          cp snap7-full-1.4.2/release/Wrappers/c-cpp/snap7.h src
-          cp .github/build_scripts/dummy.c ./
           cp .github/build_scripts/arm64_osx.mk snap7-full-1.4.2/build/osx/
           pushd snap7-full-1.4.2/build/osx/
           make -f x86_64_osx.mk all
@@ -165,7 +110,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -178,7 +123,7 @@ jobs:
       - name: Install pytest
         run: |
           python3 -m pip install --upgrade pip
-          python3 -m pip install pytest
+          python3 -m pip install pytest pytest-asyncio
 
       - name: Download artifacts
         uses: actions/download-artifact@v3
@@ -192,16 +137,16 @@ jobs:
       - name: Run pytest
         run: |
           which pytest
-          pytest test/test_server.py test/test_util.py test/test_client.py test/test_mainloop.py
+          pytest -m "server or util or client or mainloop"
 
       - name: Run tests required sudo
         if: ${{ runner.os == 'Linux'}}
-        run: sudo /opt/hostedtoolcache/Python/${{ matrix.python-version }}*/x64/bin/pytest test/test_partner.py
+        run: sudo /opt/hostedtoolcache/Python/${{ matrix.python-version }}*/x64/bin/pytest -m partner
 
       - name: Run tests required sudo
         if: ${{ runner.os == 'macOS'}}
-        run: sudo pytest test/test_partner.py
+        run: sudo pytest -m partner
 
       - name: Run tests required sudo
         if: ${{ runner.os == 'Windows'}}
-        run: pytest test/test_partner.py
+        run: pytest -m partner
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
index d56a4c5c..636dac16 100644
--- a/.github/workflows/flake8.yml
+++ b/.github/workflows/flake8.yml
@@ -20,5 +20,5 @@ jobs:
           sudo python3 -m pip install flake8
       - name: Lint with flake8
         run: |
-          flake8 --count --select=E9,F63,F7,F82 --show-source --statistics snap7 test
-          flake8 --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics snap7 test
\ No newline at end of file
+          flake8 --count --select=E9,F63,F7,F82 --show-source --statistics snap7 tests
+          flake8 --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics snap7 tests
\ No newline at end of file
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8938b0b4..6899573b 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -32,5 +32,5 @@ jobs:
       - name: Run pytest
         run: |
           which pytest
-          pytest test/test_server.py test/test_client.py test/test_util.py test/test_mainloop.py
-          sudo /opt/hostedtoolcache/Python/${{ matrix.python-version }}*/x64/bin/pytest test/test_partner.py
+          pytest -m "server or util or client or mainloop"
+          sudo /opt/hostedtoolcache/Python/${{ matrix.python-version }}*/x64/bin/pytest -m partner
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 53cb8170..c6dfc9a6 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -18,7 +18,7 @@ jobs:
         run: python3 -m pip install .[test]
       - name: Run pytest
         run: |
-          pytest test/test_server.py test/test_client.py test/test_util.py test/test_mainloop.py
-          sudo pytest test/test_partner.py
+          pytest -m "server or util or client or mainloop"
+          sudo pytest -m partner
 
 
diff --git a/.github/workflows/pycodestyle.yml b/.github/workflows/pycodestyle.yml
index 7cae6ef1..52f3a808 100644
--- a/.github/workflows/pycodestyle.yml
+++ b/.github/workflows/pycodestyle.yml
@@ -19,4 +19,4 @@ jobs:
           sudo python3 -m pip install --upgrade pip
           sudo python3 -m pip install pycodestyle
       - name: Run pycodestyle
-        run: pycodestyle snap7 test
+        run: pycodestyle snap7 tests
diff --git a/.github/workflows/test-pypi-packages.yml b/.github/workflows/test-pypi-packages.yml
index 84902260..78277c41 100644
--- a/.github/workflows/test-pypi-packages.yml
+++ b/.github/workflows/test-pypi-packages.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -27,16 +27,16 @@ jobs:
       - name: Run pytest
         run: |
           which pytest
-          pytest test/test_server.py test/test_util.py test/test_client.py
+          pytest -m "server or util or client or mainloop"
 
       - name: Run tests required sudo
         if: ${{ runner.os == 'Linux'}}
-        run: sudo /opt/hostedtoolcache/Python/${{ matrix.python-version }}*/x64/bin/pytest test/test_partner.py
-
-      - name: Run test_partner.py on windows
-        if: ${{ runner.os == 'Windows' }}
-        run: pytest test/test_partner.py
+        run: sudo /opt/hostedtoolcache/Python/${{ matrix.python-version }}*/x64/bin/pytest -m partner
 
       - name: Run tests required sudo
         if: ${{ runner.os == 'macOS'}}
-        run: sudo pytest test/test_partner.py
+        run: sudo pytest -m partner
+
+      - name: Run tests required sudo
+        if: ${{ runner.os == 'Windows'}}
+        run: pytest -m partner
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 91eb317b..6f7a7daa 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -11,19 +11,17 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Install choco packages
-        run: |
-          choco install 7zip python
-          choco install --allow-downgrade wget --version 1.20.3.20190531
+
+      - name: prepare snap7 archive
+        uses: ./.github/actions/prepare_snap7
+
       - name: Get snap7
         run: |
-          wget.exe -O snap7-full-1.4.2.7z --content-disposition -c https://sourceforge.net/projects/snap7/files/1.4.2/snap7-full-1.4.2.7z/download
-          7z x snap7-full-1.4.2.7z
           Copy-Item snap7-full-1.4.2\release\Windows\Win64\snap7.dll snap7\.
           Copy-Item snap7-full-1.4.2\release\Windows\Win64\snap7.dll C:\Windows\System32\.
-      - name: Upgrade pip and wheel for all pythons
-        run:  python.exe -m pip install --upgrade pip wheel
+
       - name: Install python libraries
-        run: python.exe -m pip install .[test]
+        run: python3.exe -m pip install .[test]
+
       - name: Run tests
-        run: pytest.exe  test/test_client.py test/test_util.py test/test_partner.py test/test_mainloop.py
+        run: python3 -m pytest -m "server or util or client or mainloop or partner"
diff --git a/Makefile b/Makefile
index 559d11ad..7a4cf2ff 100644
--- a/Makefile
+++ b/Makefile
@@ -27,14 +27,14 @@ doc: venv/bin/sphinx-build
 	cd doc && make html
 
 pycodestyle: venv/bin/pytest
-	venv/bin/pycodestyle snap7 test
+	venv/bin/pycodestyle snap7 tests
 
 mypy: venv/bin/pytest
-	venv/bin/mypy snap7 test
+	venv/bin/mypy snap7 tests
 
 test: venv/bin/pytest
-	venv/bin/pytest test/test_server.py test/test_client.py test/test_util.py test/test_mainloop.py
-	sudo venv/bin/pytest test/test_partner.py  # run this as last to prevent pytest cache dir creates as root
+	venv/bin/pytest tests/test_server.py tests/test_client.py tests/test_util.py tests/test_mainloop.py
+	sudo venv/bin/pytest tests/test_partner.py  # run this as last to prevent pytest cache dir creates as root
 
 clean:
 	rm -rf venv python_snap7.egg-info .pytest_cache .tox dist .eggs
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 4e2aa9bb..a894f49f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,4 +5,12 @@ ignore = E501,E402,W391,W292,W503
 ignore_missing_imports = True
 
 [tool:pytest]
-asyncio_mode = auto
\ No newline at end of file
+asyncio_mode = auto
+markers =
+    client
+    common
+    logo
+    mainloop
+    partner
+    server
+    util
\ No newline at end of file
diff --git a/test/test_client.py b/tests/test_client.py
similarity index 99%
rename from test/test_client.py
rename to tests/test_client.py
index 7c61e7dc..becd3177 100755
--- a/test/test_client.py
+++ b/tests/test_client.py
@@ -3,6 +3,7 @@
 import logging
 import struct
 import time
+import pytest
 import unittest
 import platform
 from datetime import datetime, timedelta, date
@@ -26,6 +27,7 @@
 slot = 1
 
 
+@pytest.mark.client
 class TestClient(unittest.TestCase):
 
     process = None
@@ -999,6 +1001,7 @@ def callback(FUsrPtr, JobOp, response):
         self.assertEqual(1, self.callback_counter)
 
 
+@pytest.mark.client
 class TestClientBeforeConnect(unittest.TestCase):
     """
     Test suite of items that should run without an open connection.
@@ -1022,6 +1025,7 @@ def test_set_param(self):
             self.client.set_param(param, value)
 
 
+@pytest.mark.client
 class TestLibraryIntegration(unittest.TestCase):
     def setUp(self):
         # replace the function load_library with a mock
diff --git a/test/test_common.py b/tests/test_common.py
similarity index 95%
rename from test/test_common.py
rename to tests/test_common.py
index bebe17d4..f1f52490 100644
--- a/test/test_common.py
+++ b/tests/test_common.py
@@ -1,4 +1,5 @@
 import logging
+import pytest
 import unittest
 import pathlib
 
@@ -10,6 +11,7 @@
 file_name_test = "test.dll"
 
 
+@pytest.mark.common
 class TestCommon(unittest.TestCase):
 
     @classmethod
diff --git a/test/test_logo_client.py b/tests/test_logo_client.py
similarity index 98%
rename from test/test_logo_client.py
rename to tests/test_logo_client.py
index 2e2ae8bd..28397dd4 100644
--- a/test/test_logo_client.py
+++ b/tests/test_logo_client.py
@@ -1,5 +1,6 @@
 import logging
 import time
+import pytest
 import unittest
 from multiprocessing import Process
 
@@ -15,6 +16,7 @@
 slot = 0x2000
 
 
+@pytest.mark.logo
 class TestLogoClient(unittest.TestCase):
 
     process = None
@@ -94,6 +96,7 @@ def test_get_param(self):
             self.assertRaises(Exception, self.client.get_param, non_client)
 
 
+@pytest.mark.logo
 class TestClientBeforeConnect(unittest.TestCase):
     """
     Test suite of items that should run without an open connection.
diff --git a/test/test_mainloop.py b/tests/test_mainloop.py
similarity index 99%
rename from test/test_mainloop.py
rename to tests/test_mainloop.py
index e71f249e..1dc608a7 100644
--- a/test/test_mainloop.py
+++ b/tests/test_mainloop.py
@@ -1,6 +1,7 @@
 import logging
 from multiprocessing.context import Process
 import time
+import pytest
 import unittest
 
 import snap7.error
@@ -19,6 +20,7 @@
 slot = 1
 
 
+@pytest.mark.mainloop
 class TestServer(unittest.TestCase):
 
     process = None
diff --git a/test/test_partner.py b/tests/test_partner.py
similarity index 98%
rename from test/test_partner.py
rename to tests/test_partner.py
index dfc1cd0a..334cc9e9 100644
--- a/test/test_partner.py
+++ b/tests/test_partner.py
@@ -1,4 +1,5 @@
 import logging
+import pytest
 import unittest as unittest
 from unittest import mock
 
@@ -8,6 +9,7 @@
 logging.basicConfig(level=logging.WARNING)
 
 
+@pytest.mark.partner
 class TestPartner(unittest.TestCase):
     def setUp(self):
         self.partner = snap7.partner.Partner()
@@ -116,6 +118,7 @@ def test_wait_as_b_send_completion(self):
         self.assertRaises(RuntimeError, self.partner.wait_as_b_send_completion)
 
 
+@pytest.mark.partner
 class TestLibraryIntegration(unittest.TestCase):
     def setUp(self):
         # replace the function load_library with a mock
diff --git a/test/test_server.py b/tests/test_server.py
similarity index 98%
rename from test/test_server.py
rename to tests/test_server.py
index 6917e063..da61ff0b 100644
--- a/test/test_server.py
+++ b/tests/test_server.py
@@ -1,5 +1,6 @@
 import ctypes
 import logging
+import pytest
 import unittest
 from unittest import mock
 
@@ -10,6 +11,7 @@
 logging.basicConfig(level=logging.WARNING)
 
 
+@pytest.mark.server
 class TestServer(unittest.TestCase):
 
     def setUp(self):
@@ -128,6 +130,7 @@ def test_get_param(self):
                           snap7.types.RemotePort)
 
 
+@pytest.mark.server
 class TestServerBeforeStart(unittest.TestCase):
     """
     Tests for server before it is started
@@ -140,6 +143,7 @@ def test_set_param(self):
         self.server.set_param(snap7.types.LocalPort, 1102)
 
 
+@pytest.mark.server
 class TestLibraryIntegration(unittest.TestCase):
     def setUp(self):
         # replace the function load_library with a mock
diff --git a/test/test_util.py b/tests/test_util.py
similarity index 99%
rename from test/test_util.py
rename to tests/test_util.py
index 11093140..db4f4896 100644
--- a/test/test_util.py
+++ b/tests/test_util.py
@@ -1,5 +1,6 @@
 import datetime
 import re
+import pytest
 import unittest
 import struct
 
@@ -114,6 +115,7 @@
 _new_bytearray[43:43 + 4] = struct.pack("I", 286331153)  # byte_index=43, value=286331153(T#3D_7H_32M_11S_153MS), bytes=4
 
 
+@pytest.mark.util
 class TestS7util(unittest.TestCase):
 
     def test_get_byte_new(self):