diff --git a/python-ntlm-auth.spec b/python-ntlm-auth.spec
index c97c2b4..85f9a20 100644
--- a/python-ntlm-auth.spec
+++ b/python-ntlm-auth.spec
@@ -1,7 +1,4 @@
 %global srcname ntlm-auth
-%global pypi_name %{srcname}
-%global gh_owner jborean93
-%global library_name ntlm_auth
 
 Name:           python-%{srcname}
 Version:        1.5.0
@@ -9,37 +6,34 @@ Release:        1%{?dist}
 Summary:        Python 3 compatible NTLM library
 
 License:        LGPLv3+
-URL:            https://pypi.python.org/pypi/%{pypi_name}
-Source0:        https://github.com/%{gh_owner}/%{pypi_name}/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
+URL:            https://pypi.python.org/pypi/ntlm-auth
+#Source:         %{pypi_source}
+Source:         https://github.com/jborean93/ntlm-auth/archive/v%{version}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  python3-setuptools
 BuildRequires:  python3-devel
-
+BuildRequires:  python3dist(setuptools)
 # For tests
-BuildRequires:  python3-pytest
-BuildRequires:  python3-requests
-BuildRequires:  python3-cryptography
+BuildRequires:  python3dist(pytest)
+BuildRequires:  python3dist(requests)
+BuildRequires:  python3dist(cryptography)
+
+%global _description %{expand:
+This package allows Python clients running on any operating system to provide
+NTLM authentication to a supporting server.}
 
-%description
- This package allows Python clients running on any operating system to provide
-NTLM authentication to a supporting server.
+%description %{_description}
 
 %package -n     python3-%{srcname}
+Summary:        %{summary}
 Obsoletes:      python3-ntlm3 < 1.0.3-1
 Provides:       python3-ntlm3 = %{version}-%{release}
-Summary:        Python 3 compatible NTLM library
 %{?python_provide:%python_provide python3-%{srcname}}
 
-%description -n python3-%{srcname}
- This package allows Python clients running on any operating system to provide
-NTLM authentication to a supporting server.
+%description -n python3-%{srcname} %{_description}
 
 %prep
-%autosetup -n %{pypi_name}-%{version}
-
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+%autosetup -n %{srcname}-%{version}
 
 %build
 %py3_build
@@ -48,13 +42,13 @@ rm -rf %{pypi_name}.egg-info
 %py3_install
 
 %check
-%{__python3} -m pytest --ignore=tests/functional/test_iis.py tests
+%python3 -m pytest -vv
 
 %files -n python3-%{srcname}
 %doc CHANGES.md README.md
 %license LICENSE
-%{python3_sitelib}/%{library_name}
-%{python3_sitelib}/%{library_name}-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/ntlm_auth-*.egg-info/
+%{python3_sitelib}/ntlm_auth/
 
 %changelog
 * Mon Sep 14 2020 Joel Capitao <jcapitao@redhat.com> - 1.5.0-1