diff --git a/srcpkgs/qt6-scxml/patches/no-cmake-test.patch b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
new file mode 100644
index 00000000000..466c45932f5
--- /dev/null
+++ b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -8,7 +8,6 @@ if(TARGET Qt::Gui AND TARGET Qt::Qml)
+         add_subdirectory(scion)
+         add_subdirectory(statemachine)
+         add_subdirectory(statemachineinfo)
+-        add_subdirectory(cmake)
+     endif()
+     # More checks inside
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab8..5286c421ba2 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,20 +11,28 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz"
-checksum=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-remoteobjects"
 fi
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-scxml-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }