diff --git a/snapcraft.yaml b/snapcraft.yaml
index 219a8fa..3cfcbed 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -155,6 +155,8 @@ parts:
       - -Doptimization=3
       - -Ddebug=true
       - -Dgtk=disabled
+      - -Dtests=disabled
+      - -Ddemos=disabled
     build-environment: *buildenv
 
   cairo:
@@ -204,6 +206,7 @@ parts:
       - -Doptimization=3
       - -Ddebug=true
       - -Dgtk_doc=false
+      - -Ddoctool=enabled
     build-environment: *buildenv
     override-build: |
       set -eux
@@ -262,6 +265,7 @@ parts:
       - -Doptimization=3
       - -Ddebug=true
       - -Ddocs=false
+      - -Dtests=false
     build-environment: *buildenv
 
   harfbuzz:
@@ -277,6 +281,8 @@ parts:
       - -Dgobject=enabled
       - -Doptimization=3
       - -Ddebug=true
+      - -Dtests=disabled
+      - -Ddocs=disabled
       - --default-library=both
     build-environment: *buildenv
     override-build: |
@@ -383,6 +389,7 @@ parts:
       - --prefix=/usr
       - -Doptimization=3
       - -Ddebug=true
+      - -Dtests=false
     build-environment: *buildenv
     build-packages:
       - libgl1-mesa-dev
@@ -400,6 +407,9 @@ parts:
       - -Doptimization=3
       - -Ddebug=true
       - -Dgtk_doc=disabled
+      - -Dintrospection=enabled
+      - -Ddocumentation=disabled
+      - -Dtests=false
     build-environment: *buildenv
 
   libpsl:
@@ -411,7 +421,7 @@ parts:
     meson-parameters:
       - --prefix=/usr
       - -Druntime=libidn2
-      - -Dtests=false # available in master, not in 0.21.2
+      - -Dtests=false
       - -Doptimization=3
       - -Ddebug=true
     build-environment: *buildenv
@@ -435,6 +445,9 @@ parts:
       - -Ddebug=true
       - -Dvapi=enabled
       - -Dtls_check=false #disable build time check, but we need to ensure glib-networking is available at runtime
+      - -Dintrospection=enabled
+      - -Ddocs=disabled
+      - -Dtests=false
     build-environment: *buildenv
     build-packages:
       - libsqlite3-dev
@@ -500,6 +513,7 @@ parts:
       - -Dbuiltin_immodules=yes
       - -Ddemos=false
       - -Dexamples=false
+      - -Dtests=false
     build-environment: *buildenv
     organize:
       usr/lib/gtk-3.0: usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0
@@ -805,6 +819,7 @@ parts:
       - --prefix=/usr
       - -Doptimization=3
       - -Ddebug=true
+      - -Dintrospection=enabled
     build-environment: *buildenv
     build-packages:
       - gettext
@@ -961,6 +976,7 @@ parts:
       - -Doptimization=3
       - -Ddebug=true
       - -Ddocumentation=false
+      - -Dtests=false
     build-environment: *buildenv
     build-packages:
       - check
@@ -1095,6 +1111,7 @@ parts:
       - --prefix=/usr
       - -Doptimization=3
       - -Ddebug=true
+      - -Dtests=false
     build-environment: *buildenv
 
   pygobject:
@@ -1107,6 +1124,7 @@ parts:
       - --prefix=/usr
       - -Doptimization=3
       - -Ddebug=true
+      - -Dtests=false
     build-environment: *buildenv
 
   libhandy:
@@ -1123,6 +1141,8 @@ parts:
       - -Dtests=false
       - -Dexamples=false
       - -Dglade_catalog=disabled
+      - -Dintrospection=enabled
+      - -Dvapi=true
     build-environment: *buildenv
 
   gjs:
@@ -1158,6 +1178,7 @@ parts:
       - -Ddebug=true
       - -Dhash_impl=internal
       - -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt
+      - -Dtest=false
     build-packages:
       - libtasn1-6-dev
     build-environment: *buildenv
@@ -1607,6 +1628,7 @@ parts:
 
       rm -rf root
       rm -rf usr/share/doc
+      rm -rf usr/share/gtk-doc
       rm -rf usr/share/man
       rm -rf usr/libexec/*/installed-tests
       rm -rf usr/libexec/installed-tests