diff --git a/srcpkgs/OpenLP/patches/py310_applocation.patch b/srcpkgs/OpenLP/patches/py310_applocation.patch
deleted file mode 100644
index 89dc3e8c8a8..00000000000
--- a/srcpkgs/OpenLP/patches/py310_applocation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 54ad75426825cdd977f770b12a62ee92218b82d6 Mon Sep 17 00:00:00 2001
-From: Raoul Snyman <raoul@snyman.info>
-Date: Thu, 3 Feb 2022 11:26:24 -0700
-Subject: [PATCH] Make two versions of a test to work around a difference in
- Python 3.10
-
----
- tests/openlp_core/common/test_applocation.py | 29 +++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/tests/openlp_core/common/test_applocation.py b/tests/openlp_core/common/test_applocation.py
-index 2aebc5213..432773ec7 100644
---- a/tests/openlp_core/common/test_applocation.py
-+++ b/tests/openlp_core/common/test_applocation.py
-@@ -22,9 +22,12 @@
- Functional tests to test the AppLocation class and related methods.
- """
- import os
-+import sys
- from pathlib import Path
- from unittest.mock import patch
- 
-+import pytest
-+
- from openlp.core.common import get_frozen_path
- from openlp.core.common.applocation import AppLocation
- 
-@@ -141,11 +144,35 @@ def test_get_directory_for_app_dir(mocked_get_frozen_path):
-     assert directory == Path.cwd() / Path('app', 'dir'), 'Directory should be "app/dir"'
- 
- 
-+@pytest.mark.skipif(sys.version_info < (3, 10), reason="Python 3.10 version of this test")
-+@patch('openlp.core.common.applocation.get_frozen_path')
-+@patch('openlp.core.common.applocation.os.path.abspath')
-+@patch('openlp.core.common.applocation.os.path.split')
-+@patch('openlp.core.common.applocation.sys')
-+def test_get_directory_for_plugins_dir_py310(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-+    """
-+    Test the AppLocation.get_directory() method for AppLocation.PluginsDir
-+    """
-+    # GIVEN: _get_frozen_path, abspath, split and sys are mocked out
-+    mocked_abspath.return_value = os.path.join('dir', 'plugins')
-+    mocked_split.return_value = ['openlp']
-+    mocked_get_frozen_path.return_value = Path('dir')
-+    mocked_sys.frozen = 1
-+    mocked_sys.argv = ['openlp']
-+
-+    # WHEN: We call AppLocation.get_directory
-+    directory = AppLocation.get_directory(AppLocation.PluginsDir)
-+
-+    # THEN: The correct directory should be returned
-+    assert directory == Path('dir', 'plugins'), 'Directory should be "dir/plugins"'
-+
-+
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="Python 3.9 version of this test")
- @patch('openlp.core.common.applocation.get_frozen_path')
- @patch('openlp.core.common.applocation.os.path.abspath')
- @patch('openlp.core.common.applocation.os.path.split')
- @patch('openlp.core.common.applocation.sys')
--def test_get_directory_for_plugins_dir(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-+def test_get_directory_for_plugins_dir_py39(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-     """
-     Test the AppLocation.get_directory() method for AppLocation.PluginsDir
-     """
--- 
-GitLab
-
diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index 023ffdbc38d..e8dd194f52b 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,13 +1,9 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=2.9.4
+version=2.9.5
 revision=1
-wrksrc="OpenLP-${version}"
 create_wrksrc=yes
 build_style=python3-module
-# test always fails with AssertionError
-# see https://gitlab.com/openlp/openlp/-/issues/1024
-make_check_args="--deselect tests/openlp_core/ui/test_mainwindow.py::test_load_settings_position_invalid"
 hostmakedepends="python3-setuptools qt5-host-tools"
 depends="python3-alembic python3-appdirs python3-BeautifulSoup4 python3-chardet
  python3-dbus python3-distro python3-Flask python3-Flask-Cors python3-lxml
@@ -15,19 +11,14 @@ depends="python3-alembic python3-appdirs python3-BeautifulSoup4 python3-chardet
  python3-PyQt5-multimedia python3-PyQt5-webengine python3-vlc python3-qrcode
  python3-QtAwesome python3-requests python3-SQLAlchemy python3-waitress
  python3-WebOb python3-websockets python3-zeroconf"
-checkdepends="python3-pytest-qt ${depends}"
+checkdepends="python3-pytest-qt xvfb-run ${depends}"
 short_desc="Free Worship Presentation Software for your Church"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-3.0-or-later"
 homepage="https://openlp.org/"
 distfiles="https://get.openlp.org/${version}/OpenLP-${version}.tar.gz"
-checksum=24dcd14841b5a6a03e0ac12202628429f467264ac8605268c63b6634121dd73a
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	# test fails with XMLSyntaxError
-	# see https://gitlab.com/openlp/openlp/-/issues/1023
-	make_check_args+=" --deselect tests/openlp_plugins/songs/test_presentationmanagerimport.py::test_presenter_manager"
-fi
+checksum=4648e6869ffe2fb88a1e2b90705e1cf709dd6dd24abbfe2e17df13742e701c09
+make_check_pre="env -u QT_QPA_PLATFORM xvfb-run"
 
 post_install() {
 	vinstall resources/openlp.desktop 644 usr/share/applications
diff --git a/srcpkgs/OpenLP/update b/srcpkgs/OpenLP/update
deleted file mode 100644
index abb68da72a2..00000000000
--- a/srcpkgs/OpenLP/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.9.*" # pre-release of 3