diff --git a/www/py-httmock/Makefile b/www/py-httmock/Makefile
index 257109e160aca..f550e348fafaf 100644
--- a/www/py-httmock/Makefile
+++ b/www/py-httmock/Makefile
@@ -3,13 +3,7 @@
 PORTNAME=	httmock
 PORTVERSION=	1.3.0
 CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP \
-		https://raw.githubusercontent.com/patrys/${PORTNAME}/${PORTVERSION}/:tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		tests.py:tests
-DIST_SUBDIR=	py-${PORTNAME}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Mocking library for requests
@@ -20,15 +14,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR}
 
 USES=		python
+USE_GITHUB=	yes # tests missing from PyPI sdist
 USE_PYTHON=	distutils autoplist
 
-NO_ARCH=	yes
+GH_ACCOUNT=	patrys
 
-# Description: tests.py is missing from the pypi package
-# Issue ID: https://github.com/patrys/httmock/issues/55
-# TODO: Remove extra MASTER_SITES, DISTFILES/SUBDIR, EXTRACT_ONLY, post-extract
-post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/tests.py ${WRKSRC}
+NO_ARCH=	yes
 
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/www/py-httmock/distinfo b/www/py-httmock/distinfo
index 3326adaa5f4cd..9104d85146fd6 100644
--- a/www/py-httmock/distinfo
+++ b/www/py-httmock/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1548775891
-SHA256 (py-httmock/httmock-1.3.0.tar.gz) = e0bbaced224426bcd994a5f1c64ab60e0c923ea615825c53e6c0190b2a7341fe
-SIZE (py-httmock/httmock-1.3.0.tar.gz) = 4428
-SHA256 (py-httmock/tests.py) = 544bcd2a837b7493df8062b16611de4e53fc2761ffa25e9553a2ffdbc0972d2c
-SIZE (py-httmock/tests.py) = 11680
+TIMESTAMP = 1576633617
+SHA256 (patrys-httmock-1.3.0_GH0.tar.gz) = 4716729f0d07f3f6043dde43545a5381c4c6031a62e9dc9eed21e73c63d86722
+SIZE (patrys-httmock-1.3.0_GH0.tar.gz) = 6186