diff --git a/python-configobj.spec b/python-configobj.spec
index a6d828d..69df557 100644
--- a/python-configobj.spec
+++ b/python-configobj.spec
@@ -8,20 +8,22 @@ Summary:        Config file reading, writing, and validation
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://configobj.readthedocs.org/
-Source0:        https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-Source1:        https://raw.githubusercontent.com/DiffSK/configobj/master/LICENSE
-# to get tests
-# git clone https://github.com/DiffSK/configobj.git && cd configobj
-# git checkout v5.0.5
-# tar -czf configobj-5.0.5-tests.tar.gz tests/ test_configobj.py
-#Source1:        configobj-%{version}-tests.tar.gz
+# Moved to the github release instead of the pypi one since multiple elements (License and tests)
+# are not available using pypi. Two bugs have been filled about this:
+# https://github.com/DiffSK/configobj/issues/98
+# https://github.com/DiffSK/configobj/issues/99
+# Source0:        https://pypi.python.org/packages/source/c/configobj/configobj-5.0.6.tar.gz
+Source0:        https://github.com/DiffSK/%{pypi_name}/archive/v%{version}.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
+BuildRequires:  python-six
+BuildRequires:  python-pytest
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-#BuildRequires:  python3-pytest
+BuildRequires:  python3-six
+BuildRequires:  python3-pytest
 
 %description
 ConfigObj is a simple but powerful config file reader and writer: an ini file
@@ -92,7 +94,6 @@ It has lots of other features though:
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
-cp %{SOURCE1} .
 
 %build
 %py2_build
@@ -102,21 +103,12 @@ cp %{SOURCE1} .
 %py3_install
 %py2_install
 
-#%check
-# this needs to be set for tests.test_configobj.test_options_deprecation
-#export PYTHONWARNINGS=always
-#
-#tar -xzf %{SOURCE1}
-#%{__python} test_configobj.py
-#py.test tests
-#
-#%if 0%{?with_python3}
-#pushd %{py3dir}
-#tar -xzf %{SOURCE1}
-#%{__python3} test_configobj.py
+%check
+# Disable tests since they are failing (see https://github.com/DiffSK/configobj/issues/100)
+%{__python2} test_configobj.py
+#py.test-%{python2_version} tests
+%{__python3} test_configobj.py
 #py.test-%{python3_version} tests
-#popd
-#%endif
 
 %files -n python2-%{pypi_name}
 %{!?_licensedir:%global license %doc}