diff --git a/python-terminado.changes b/python-terminado.changes
index b148bbe..5841d36 100644
--- a/python-terminado.changes
+++ b/python-terminado.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 13 22:05:59 UTC 2018 - toddrme2178@gmail.com
+
+- Disable tests until random testing race condition fixed
+  * see: https://github.com/jupyter/terminado/issues/21
+
 -------------------------------------------------------------------
 Tue Nov 28 18:56:09 UTC 2017 - arun@gmx.de
 
diff --git a/python-terminado.spec b/python-terminado.spec
index 63fba80..52ce552 100644
--- a/python-terminado.spec
+++ b/python-terminado.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-terminado
 #
-# 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
@@ -16,7 +16,8 @@
 #
 
 
-%bcond_without tests
+# Disable tests until random testing race condition fixed, see: https://github.com/jupyter/terminado/issues/21
+%bcond_with     tests
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-terminado
@@ -25,7 +26,7 @@ Release:        0
 Summary:        Terminals served to termjs using Tornado websockets
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Url:            https://github.com/takluyver/terminado
+Url:            https://github.com/jupyter/terminado
 Source:         https://files.pythonhosted.org/packages/source/t/terminado/terminado-%{version}.tar.gz
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module ptyprocess}
@@ -34,11 +35,10 @@ BuildRequires:  %{python_module tornado}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 %if %{with tests}
-BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module pytest}
 %endif
 Requires:       python-ptyprocess
 Requires:       python-tornado
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %python_subpackages
 
@@ -62,7 +62,11 @@ of QWeb).
 
 %if %{with tests}
 %check
-%python_expand nosetests-%{$python_bin_suffix}
+pushd terminado/tests
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
+py.test-%{$python_bin_suffix} .
+}
+popd
 %endif
 
 %files %{python_files}