diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>
diff --git a/python-ws4py.changes b/python-ws4py.changes
index f205975..cc4181e 100644
--- a/python-ws4py.changes
+++ b/python-ws4py.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Apr 11 12:09:24 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
+
+- update to version 0.5.1
+  * fixed runtime error: Set changed size during iteration
+  * on secure, only pass the requested number of bytes to the parsers
+  * Change threaded client test to test ssl socket
+  * exclude certain headers when requested
+  * Disable build for Python 3.4
+- launch tests using multibuild
+
 -------------------------------------------------------------------
 Tue Dec  4 12:56:13 UTC 2018 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-ws4py.spec b/python-ws4py.spec
index 5487eb2..c33d2c4 100644
--- a/python-ws4py.spec
+++ b/python-ws4py.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-ws4py
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,26 +17,34 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without  test
-Name:           python-ws4py
-Version:        0.4.2
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name:           python-ws4py%{psuffix}
+Version:        0.5.1
 Release:        0
 Summary:        WebSocket client and server library for Python
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Url:            https://github.com/Lawouach/WebSocket-for-Python
+URL:            https://github.com/Lawouach/WebSocket-for-Python
 Source:         https://files.pythonhosted.org/packages/source/w/ws4py/ws4py-%{version}.tar.gz
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+BuildArch:      noarch
 %if %{with test}
-BuildRequires:  %{python_module CherryPy}
 BuildRequires:  %{python_module gevent}
 BuildRequires:  %{python_module greenlet}
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module tornado}
+BuildRequires:  %{python_module ws4py = %{version}}
 %endif
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -45,21 +53,28 @@ defined in RFC 6455.
 
 %prep
 %setup -q -n ws4py-%{version}
+# CherryPy is python3 only to ease the testing just skip it here
+rm test/test_cherrypy.py
 
 %build
 %python_build
 
 %install
+%if !%{with test}
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %if %{with test}
 %check
-%python_exec setup.py test
+%pytest
 %endif
 
+%if !%{with test}
 %files %{python_files}
-%defattr(-,root,root,-)
+%license LICENSE
+%doc README.md
 %{python_sitelib}/*
+%endif
 
 %changelog
diff --git a/ws4py-0.4.2.tar.gz b/ws4py-0.4.2.tar.gz
deleted file mode 100644
index eabde77..0000000
--- a/ws4py-0.4.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ac69ce3e6ec6917a5d678b65f0a18e244a4dc670db6414bc0271b3f4911237f
-size 40849
diff --git a/ws4py-0.5.1.tar.gz b/ws4py-0.5.1.tar.gz
new file mode 100644
index 0000000..ca1c1ea
--- /dev/null
+++ b/ws4py-0.5.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483
+size 51408