diff --git a/pytest-qt-2.1.2.tar.gz b/pytest-qt-2.1.2.tar.gz
deleted file mode 100644
index b670e1b..0000000
--- a/pytest-qt-2.1.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f029b2aa1654f6b90fb7b2cbebd185cc1de7b792df6fdbb9af948b854a05ff7
-size 108381
diff --git a/pytest-qt-2.3.1.tar.gz b/pytest-qt-2.3.1.tar.gz
new file mode 100644
index 0000000..91ed296
--- /dev/null
+++ b/pytest-qt-2.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47cc12b645d2bb9f597e2df6c8934fbc57bd932a7616247bed9b8407d57e340b
+size 108383
diff --git a/python-pytest-qt.changes b/python-pytest-qt.changes
index 81ea34e..76cd00a 100644
--- a/python-pytest-qt.changes
+++ b/python-pytest-qt.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Sun May 13 08:24:32 UTC 2018 - tchvatal@suse.com
+
+- Enable tests
+- Add patch skip-timeout-tests.patch to skip test randomly
+  failing in OBS
+
+-------------------------------------------------------------------
+Sat May 12 16:24:16 UTC 2018 - arun@gmx.de
+
+- specfile:
+  * update copyright year
+
+- update to version 2.3.1:
+  * PYTEST_QT_API environment variable correctly wins over qt_api ini
+    variable if both are set at the same time (#196). Thanks @mochick
+    for the PR.
+
+- changes from version 2.3.0:
+  * New qapp_args fixture which can be used to pass custom arguments
+    to QApplication. Thanks @The-Compiler for the PR.
+
+- changes from version 2.2.1:
+  * modeltester now accepts QBrush for BackgroundColorRole and
+    TextColorRole (#189). Thanks @p0las for the PR.
+
+- changes from version 2.2.0:
+  * pytest-qt now supports PySide2 thanks to @rth!
+
 -------------------------------------------------------------------
 Mon Aug 28 17:13:21 UTC 2017 - toddrme2178@gmail.com
 
diff --git a/python-pytest-qt.spec b/python-pytest-qt.spec
index ab24af0..3508149 100644
--- a/python-pytest-qt.spec
+++ b/python-pytest-qt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pytest-qt
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,41 +17,40 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_with     test
 Name:           python-pytest-qt
-Version:        2.1.2
+Version:        2.3.1
 Release:        0
 Summary:        Pytest support for PyQt and PySide applications
 License:        MIT
 Group:          Development/Languages/Python
-Url:            http://github.com/pytest-dev/pytest-qt
+URL:            http://github.com/pytest-dev/pytest-qt
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-qt/pytest-qt-%{version}.tar.gz
-BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module setuptools_scm}
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
-%if %{with test}
+Patch0:         skip-timeout-tests.patch
 BuildRequires:  %{python_module pytest >= 2.7.0}
 BuildRequires:  %{python_module qt5}
-%endif
+BuildRequires:  %{python_module setuptools_scm}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  dos2unix
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  xvfb-run
 Requires:       python-pytest >= 2.7.0
 Requires:       python-qt5
 BuildArch:      noarch
-
 %python_subpackages
 
 %description
 Pytest-qt is a pytest plugin that allows programmers to write tests
 for PySide and PyQt applications.
 
-The main usage is to use the `qtbot` fixture, responsible for handling `qApp` 
-creation as needed and provides methods to simulate user interaction, 
+The main usage is to use the `qtbot` fixture, responsible for handling `qApp`
+creation as needed and provides methods to simulate user interaction,
 like key presses and mouse clicks.
 
 %prep
 %setup -q -n pytest-qt-%{version}
-sed -i 's/\r$//' LICENSE
+%patch0 -p1
+dos2unix LICENSE
 
 %build
 %python_build
@@ -60,15 +59,13 @@ sed -i 's/\r$//' LICENSE
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%if %{with test}
 %check
 export PYTEST_QT_API=pyqt5
-%python_exec -m pytest -v
-%endif
+%python_expand PYTHONPATH="%{buildroot}%{$python_sitelib}" xvfb-run --server-args="-screen 0 1920x1080x24" py.test-%{py_ver} -v
 
 %files %{python_files}
-%defattr(-,root,root,-)
-%doc CHANGELOG.rst LICENSE README.rst
+%license LICENSE
+%doc CHANGELOG.rst README.rst
 %{python_sitelib}/*
 
 %changelog
diff --git a/skip-timeout-tests.patch b/skip-timeout-tests.patch
new file mode 100644
index 0000000..0473c89
--- /dev/null
+++ b/skip-timeout-tests.patch
@@ -0,0 +1,12 @@
+Index: pytest-qt-2.3.1/tests/test_basics.py
+===================================================================
+--- pytest-qt-2.3.1.orig/tests/test_basics.py
++++ pytest-qt-2.3.1/tests/test_basics.py
+@@ -73,6 +73,7 @@ def test_stop_for_interaction(qtbot, tim
+ 
+ @pytest.mark.parametrize('show', [True, False])
+ @pytest.mark.parametrize('method_name', ['waitExposed', 'waitActive'])
++@pytest.mark.skip(reason="Fails in OBS randomly")
+ def test_wait_window(show, method_name, qtbot):
+     """
+     Using one of the wait-widget methods should not raise anything if the widget