diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8b514949..80e7176e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
                 dnf -y install nss-softokn nss-tools nss-softokn-devel \
                   nss-devel
               elif [ "${{ matrix.token }}" = "softhsm" ]; then
-                dnf -y install softhsm p11-kit-devel p11-kit-server
+                dnf -y install softhsm p11-kit-devel
               fi
             elif [ -f /etc/debian_version ]; then
               apt-get -q update
diff --git a/packaging/pkcs11-provider.spec b/packaging/pkcs11-provider.spec
index 1eccb725..5fe18a8f 100644
--- a/packaging/pkcs11-provider.spec
+++ b/packaging/pkcs11-provider.spec
@@ -29,7 +29,6 @@ BuildRequires: openssl
 BuildRequires: softhsm
 BuildRequires: opensc
 BuildRequires: p11-kit-devel
-BuildRequires: p11-kit-server
 BuildRequires: gnutls-utils
 BuildRequires: xz
 BuildRequires: expect
diff --git a/tests/integration/bind.sh b/tests/integration/bind.sh
index 8b0bbd8e..3a0a152c 100755
--- a/tests/integration/bind.sh
+++ b/tests/integration/bind.sh
@@ -17,7 +17,7 @@ install_dependencies()
     dnf install -y --skip-broken \
         meson \
         p11-kit httpd mod_ssl openssl-devel gnutls-utils nss-tools \
-        p11-kit-devel p11-kit-server opensc softhsm-devel procps-ng \
+        p11-kit-devel opensc softhsm-devel procps-ng \
         openssl util-linux bind9-next opensc
 }
 
diff --git a/tests/integration/httpd.sh b/tests/integration/httpd.sh
index 3fb43478..d4c948ff 100755
--- a/tests/integration/httpd.sh
+++ b/tests/integration/httpd.sh
@@ -19,7 +19,7 @@ install_dependencies()
     dnf install -y --skip-broken \
         meson \
         p11-kit httpd mod_ssl openssl-devel gnutls-utils nss-tools \
-        p11-kit-devel p11-kit-server opensc softhsm-devel procps-ng \
+        p11-kit-devel opensc softhsm-devel procps-ng \
         openssl util-linux
 }
 
diff --git a/tests/integration/libssh.sh b/tests/integration/libssh.sh
index 08aca28a..138a1728 100755
--- a/tests/integration/libssh.sh
+++ b/tests/integration/libssh.sh
@@ -14,7 +14,7 @@ install_dependencies()
     title PARA "Install dependencies"
 
     dnf install -y --skip-broken cmake libcmocka libcmocka-devel softhsm \
-      nss-tools gnutls-utils p11-kit p11-kit-devel p11-kit-server opensc \
+      nss-tools gnutls-utils p11-kit p11-kit-devel opensc \
       softhsm-devel socket_wrapper nss_wrapper uid_wrapper pam_wrapper \
       priv_wrapper openssh-server zlib-devel git meson \
       openssl-devel gcc g++ libcmocka-devel
diff --git a/tests/softhsm-proxy.sh b/tests/softhsm-proxy.sh
deleted file mode 100755
index 20dd434d..00000000
--- a/tests/softhsm-proxy.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -e
-# Copyright (C) 2022 Jakub Jelen <jjelen@redhat.com>
-# SPDX-License-Identifier: Apache-2.0
-
-source "${TESTSSRCDIR}/helpers.sh"
-
-# p11-kit complains if there is not runtime directory
-if [ -z "$XDG_RUNTIME_DIR" ]; then
-    export XDG_RUNTIME_DIR=$PWD
-fi
-
-if [ "$P11KITCLIENTPATH" = "" ]; then
-    echo "Missing P11KITCLIENTPATH env variable"
-    exit 0
-fi
-
-title PARA "Start the p11-kit server and check if it works"
-# shellcheck disable=SC2046 # we want to split these for eval
-eval $(p11-kit server --provider "$P11LIB" "pkcs11:")
-
-# unset OPENSSL_CONF here to avoid automatically loading the provider
-# and SoftHSM from pkcs11-tool and crashing during the cleanup again.
-OPENSSL_CONF='' pkcs11-tool -O --login --pin="$PINVALUE" --module="$P11KITCLIENTPATH" > /dev/null
-
-#register clean function to kill p11-kit-server
-trap 'cleanup_server p11-kit $P11_KIT_SERVER_PID' EXIT
-
-#Set up environment variables
-export PKCS11_PROVIDER_MODULE="${P11KITCLIENTPATH}"
-
-"$*"
diff --git a/tests/test-wrapper b/tests/test-wrapper
index d1a69024..2cc6e615 100755
--- a/tests/test-wrapper
+++ b/tests/test-wrapper
@@ -41,12 +41,6 @@ if [ -f "${TEST_PATH}/t${TEST_NAME}.c" ]; then
     COMMAND="$CHECKER $COMMAND"
 fi
 
-for option in "${TEST_PARAMS[@]}"; do
-    if [[ "$option" == "proxy" ]]; then
-        COMMAND="${TESTSSRCDIR}/softhsm-proxy.sh $COMMAND"
-    fi
-done
-
 LOGFILE="${TESTBLDDIR}/${TEST_NAME}.${TOKEN_DRIVER}.log"
 
 echo "Executing ${COMMAND}"