diff --git a/billiard-3.6.1.0.tar.gz b/billiard-3.6.1.0.tar.gz
deleted file mode 100644
index de54b53..0000000
--- a/billiard-3.6.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8809c74f648dfe69b973c8e660bcec00603758c9db8ba89d7719f88d5f01f26
-size 151717
diff --git a/billiard-3.6.3.0.tar.gz b/billiard-3.6.3.0.tar.gz
new file mode 100644
index 0000000..b12a844
--- /dev/null
+++ b/billiard-3.6.3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d91725ce6425f33a97dfa72fb6bfef0e47d4652acd98a032bd1a7fbf06d5fa6a
+size 155090
diff --git a/python-billiard.changes b/python-billiard.changes
index 2ef9b15..34bc820 100644
--- a/python-billiard.changes
+++ b/python-billiard.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Apr  6 12:24:22 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Stop building Python 2 packages (we avoid also weird constructs
+  with alternative noarch package).
+
+-------------------------------------------------------------------
+Mon Mar 30 14:04:42 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- Update to 3.6.3.0
+  * Close the inqueue and outqueue when terminating to avoid file descriptor leakage.
+  * upgrade to pytest<6
+  * Test against the latest Python 3.8 and PyPy3 release
+
 -------------------------------------------------------------------
 Fri Sep 13 11:19:39 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-billiard.spec b/python-billiard.spec
index 338be48..f51d57b 100644
--- a/python-billiard.spec
+++ b/python-billiard.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-billiard
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,9 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
 Name:           python-billiard
-Version:        3.6.1.0
+Version:        3.6.3.0
 Release:        0
 Summary:        Python multiprocessing fork
 License:        BSD-3-Clause
@@ -27,17 +28,14 @@ URL:            https://github.com/celery/billiard
 Source:         https://files.pythonhosted.org/packages/source/b/billiard/billiard-%{version}.tar.gz
 BuildRequires:  %{python_module case >= 1.3.1}
 BuildRequires:  %{python_module psutil}
-BuildRequires:  %{python_module pytest < 5}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  python2-devel
 # Documentation requirements
 BuildRequires:  python3-Sphinx >= 0.5
 Suggests:       %{name}-doc = %{version}
-%ifpython3
 BuildArch:      noarch
-%endif
 
 %package -n %{name}-doc
 Summary:        Documentation for %{name}
@@ -72,13 +70,12 @@ popd
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
-%python_exec setup.py test
+%pytest
 
 %files %{python_files}
 %doc CHANGES.txt README.rst
 %license LICENSE.txt
-%python3_only %{python_sitelib}/*
-%python2_only %{python_sitearch}/*
+%{python_sitelib}/*
 
 %files -n %{name}-doc
 %doc Doc/html