diff --git a/misc/quantum++/Makefile b/misc/quantum++/Makefile
index ed94e90f5d9d..09c98231a1be 100644
--- a/misc/quantum++/Makefile
+++ b/misc/quantum++/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	quantum++
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.7
+DISTVERSION=	3.0
 CATEGORIES=	misc devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ header-only general purpose quantum computing library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++11-lang eigen:3,build,run
+USES=		cmake:testing compiler:c++11-lang eigen:3,build,run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	softwareQinc
 GH_PROJECT=	qpp
 
+CMAKE_TESTING_ON=	WITH_UNIT_TESTS
+CMAKE_TESTING_TARGET=	unit_tests
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-do-test:
-	@cd ${BUILD_WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} unit_tests && \
-		ctest
+post-test: # run tests
+	@${BUILD_WRKSRC}/unit_tests/unit_tests
 
 .include <bsd.port.mk>
diff --git a/misc/quantum++/distinfo b/misc/quantum++/distinfo
index 09133ec33d17..59a684c668c9 100644
--- a/misc/quantum++/distinfo
+++ b/misc/quantum++/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627931380
-SHA256 (softwareQinc-qpp-v2.7_GH0.tar.gz) = 170f7efd20ea75427fa06e33d2816d446a8e584e19f391f7af8ab88414482cad
-SIZE (softwareQinc-qpp-v2.7_GH0.tar.gz) = 1116950
+TIMESTAMP = 1633841212
+SHA256 (softwareQinc-qpp-v3.0_GH0.tar.gz) = c26c9ae1465972ceb9d731c54345e59e35951cbe2485769bd48fa9e66c4e2ee6
+SIZE (softwareQinc-qpp-v3.0_GH0.tar.gz) = 5554155
diff --git a/misc/quantum++/pkg-plist b/misc/quantum++/pkg-plist
index 6cf013b39612..a768950d30bd 100644
--- a/misc/quantum++/pkg-plist
+++ b/misc/quantum++/pkg-plist
@@ -1,40 +1,54 @@
 include/qpp/MATLAB/matlab.hpp
 include/qpp/classes/circuits/circuits.hpp
 include/qpp/classes/circuits/engines.hpp
 include/qpp/classes/codes.hpp
 include/qpp/classes/exception.hpp
 include/qpp/classes/gates.hpp
 include/qpp/classes/idisplay.hpp
 include/qpp/classes/init.hpp
 include/qpp/classes/layouts.hpp
 include/qpp/classes/noise.hpp
 include/qpp/classes/random_devices.hpp
 include/qpp/classes/reversible.hpp
 include/qpp/classes/states.hpp
 include/qpp/classes/timer.hpp
 include/qpp/constants.hpp
 include/qpp/entanglement.hpp
 include/qpp/entropies.hpp
 include/qpp/experimental/experimental.hpp
 include/qpp/functions.hpp
 include/qpp/input_output.hpp
 include/qpp/instruments.hpp
 include/qpp/internal/classes/iomanip.hpp
 include/qpp/internal/classes/singleton.hpp
 include/qpp/internal/util.hpp
 include/qpp/number_theory.hpp
 include/qpp/operations.hpp
-include/qpp/qasm/ast.hpp
-include/qpp/qasm/lexer.hpp
-include/qpp/qasm/parser.hpp
-include/qpp/qasm/preprocessor.hpp
 include/qpp/qasm/qasm.hpp
-include/qpp/qasm/token.hpp
+include/qpp/qasmtools/ast/ast.hpp
+include/qpp/qasmtools/ast/base.hpp
+include/qpp/qasmtools/ast/decl.hpp
+include/qpp/qasmtools/ast/expr.hpp
+include/qpp/qasmtools/ast/program.hpp
+include/qpp/qasmtools/ast/replacer.hpp
+include/qpp/qasmtools/ast/semantic.hpp
+include/qpp/qasmtools/ast/stmt.hpp
+include/qpp/qasmtools/ast/traversal.hpp
+include/qpp/qasmtools/ast/var.hpp
+include/qpp/qasmtools/ast/visitor.hpp
+include/qpp/qasmtools/parser/lexer.hpp
+include/qpp/qasmtools/parser/parser.hpp
+include/qpp/qasmtools/parser/position.hpp
+include/qpp/qasmtools/parser/preprocessor.hpp
+include/qpp/qasmtools/parser/token.hpp
+include/qpp/qasmtools/tools/ast_printer.hpp
+include/qpp/qasmtools/utils/angle.hpp
+include/qpp/qasmtools/utils/templates.hpp
 include/qpp/qpp.h
 include/qpp/random.hpp
 include/qpp/statistics.hpp
 include/qpp/traits.hpp
 include/qpp/types.hpp
 lib/cmake/qpp/qppConfig.cmake
 lib/cmake/qpp/qpp_dependencies.cmake
 lib/cmake/qpp/qpp_targets.cmake