diff --git a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile
index d79ac169a871..2fcda9455e99 100644
--- a/devel/rapidjson/Makefile
+++ b/devel/rapidjson/Makefile
@@ -1,51 +1,54 @@
 PORTNAME=	rapidjson
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0-709
 DISTVERSIONSUFFIX=	-g06d58b9e
 CATEGORIES=	devel textproc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast JSON parser/generator for C++ with both SAX/DOM style API
 WWW=		https://github.com/Tencent/rapidjson
 
 LICENSE=	unknown
 LICENSE_NAME=	RapidJSON
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 TEST_DEPENDS=	googletest>0:devel/googletest \
-		valgrind:devel/valgrind
+		${TEST_DEPENDS_${ARCH}}
+TEST_DEPENDS_amd64=	valgrind:devel/valgrind
+TEST_DEPENDS_i386=	valgrind:devel/valgrind
 
 USES=		cmake:testing compiler:c++11-lang cpe pathfix
 CPE_VENDOR=	tencent
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Tencent
 
 NO_ARCH=	yes
 
-CMAKE_ARGS=	-DGTEST_INCLUDE_DIR=${LOCALBASE}/include -DGTESTSRC_FOUND=TRUE
-CMAKE_OFF=	RAPIDJSON_BUILD_TESTS RAPIDJSON_BUILD_EXAMPLES
+CMAKE_ARGS=	-DGTEST_SOURCE_DIR=${NONEXISTENT} -DGTEST_INCLUDE_DIR=${LOCALBASE}/include -DGTESTSRC_FOUND=TRUE
+CMAKE_OFF=	RAPIDJSON_BUILD_CXX11 RAPIDJSON_BUILD_TESTS RAPIDJSON_BUILD_EXAMPLES
 CMAKE_TESTING_ON=	RAPIDJSON_BUILD_TESTS
+CMAKE_TESTING_ARGS=	${"${TEST_DEPENDS:Mvalgrind*}":?:-DCMAKE_CTEST_ARGUMENTS\:STRING="-E;valgrind"}
 
 OPTIONS_DEFINE=	DOXYGEN
 OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 OPTIONS_SUB=	yes
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CMAKE_BOOL=	RAPIDJSON_BUILD_DOC
 
 DATADIR=	${PREFIX}/share/doc/RapidJSON
 PORTDATA=	*
 
 CXXFLAGS+=	-Wno-error
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|DOC_INSTALL_DIR}/examples"|CMAKE_INSTALL_PREFIX}/share/examples/${PORTNAME}"| ; s| -march=native||' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|.*travis.*||' ${WRKSRC}/CMakeLists.txt   # travis_doc breaks cmake: see https://github.com/miloyip/rapidjson/issues/715
 	@${REINPLACE_CMD} -e 's|add_subdirectory.*googletest.*|link_directories(${LOCALBASE}/lib)|' ${WRKSRC}/test/CMakeLists.txt
 
 post-install:
 	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/CMake*
 
 .include <bsd.port.mk>