diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile
index 83a1f16a3d0f..b2831a472319 100644
--- a/www/qt5-webkit/Makefile
+++ b/www/qt5-webkit/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=		webkit
 DISTVERSION=		5.212.0-alpha4
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		www
 MASTER_SITES=		https://github.com/qt${PORTNAME}/qt${PORTNAME}/releases/download/${DISTNAME}/
 PKGNAMEPREFIX=		qt5-
 DISTNAME=		qt${PORTNAME}-${DISTVERSION}
 
 PATCH_SITES=		https://github.com/qt${PORTNAME}/qt${PORTNAME}/commit/
 PATCHFILES+=		78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch:-p1
 
 MAINTAINER=		kde@FreeBSD.org
 COMMENT=		QtWebKit with a more modern WebKit code base
 
 LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
 			libhyphen.so:textproc/hyphen \
 			libicui18n.so:devel/icu \
 			libpng.so:graphics/png \
 			libwebp.so:graphics/webp \
 			libwoff2dec.so:devel/woff2
 
 USES=			bison cmake compiler:c++11-lang gnome gperf jpeg \
 			pathfix perl5 pkgconfig python:3.5+,build qt:5 sqlite:3 \
 			tar:xz xorg
 USE_GNOME=		glib20 libxml2 libxslt
 USE_PERL5=		build
 USE_QT=			core declarative gui location network opengl printsupport \
-			sensors testlib webchannel widgets \
-			buildtools_build qmake_build
+			sensors webchannel widgets \
+			buildtools_build qmake_build testlib_build
 USE_RUBY=		yes
 USE_XORG=		x11 xcomposite xrender
 
 # Fix pkgconfig install paths.
 PATHFIX_CMAKELISTSTXT=	PlatformQt.cmake
 
 RUBY_NO_RUN_DEPENDS=	yes
 
 CMAKE_ARGS=		-DPORT:STRING="Qt" \
 			-DKDE_INSTALL_INCLUDEDIR:PATH="${QT_INCDIR_REL}" \
 			-DKDE_INSTALL_LIBDIR:PATH="${QT_LIBDIR_REL}"
 CMAKE_ON=		ENABLE_OPENGL
 CMAKE_OFF=		USE_QT_MULTIMEDIA USE_LD_GOLD
 
 # Add -DNDEBUG to CXXFLAGS which in turn gets sucked into
 # CMAKE_CXX_FLAGS_RELEASE where we actually want to have it.
 # [for the ASSERT in Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp ]
 CXXFLAGS+=		-DNDEBUG
 
 PLIST_SUB=		FULLVER="${PORTVERSION:R}"
 
 SUB_FILES=		pkg-install
 SUB_LIST=		QT_INCDIR="${QT_INCDIR}"
 
 OPTIONS_DEFINE=	GSTREAMER
 OPTIONS_DEFAULT=	GSTREAMER
 
 GSTREAMER_LIB_DEPENDS=	libgstapp-1.0.so:multimedia/gstreamer1-plugins \
 			libgstbase-1.0.so:multimedia/gstreamer1
 GSTREAMER_USE=		GSTREAMER1=core
 GSTREAMER_CMAKE_OFF=	-DUSE_GSTREAMER:BOOL=OFF
 
 BINARY_ALIAS=		python3=${PYTHON_CMD}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile
index 1af2b482cdca..26cc35252a37 100644
--- a/x11-toolkits/qt5-declarative/Makefile
+++ b/x11-toolkits/qt5-declarative/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	declarative
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt declarative framework for dynamic user interfaces
 
 USES=		compiler:c++11-lang gl python:build qmake:norecursive \
 		qt-dist:5
 USE_GL=		gl
-USE_QT=		core gui network sql testlib \
-		widgets buildtools_build
+USE_QT=		core gui network sql widgets \
+		buildtools_build testlib_build
 
 CONFLICTS=	qt5-declarative-render2d-* qt5-qml qt5-quick
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 QT_BINARIES=	yes
 QT_DEFINES=	ACCESSIBILITY
 QT_CONFIG=	accessibility accessibility-atspi-bridge
 
 TOOLS=		qml qmlcachegen qmleasing qmlformat qmlimportscanner qmllint qmlmin \
 		qmlplugindump qmlpreview qmlprofiler qmlscene qmltestrunner qmltyperegistrar
 post-patch:
 # qtdeclarative.pro wants to run python, replace that with PYTHON_CMD
 	${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \
 		${WRKSRC}/qtdeclarative.pro
 	${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \
 		${WRKSRC}/src/3rdparty/masm/masm.pri
 
 .include <bsd.port.mk>