diff --git a/tests/spread/core24/appstream-desktop/desktop/expected_snap.yaml b/tests/spread/core24/appstream-desktop/desktop/expected_snap.yaml
index 6826bfaead..8b4b15e543 100644
--- a/tests/spread/core24/appstream-desktop/desktop/expected_snap.yaml
+++ b/tests/spread/core24/appstream-desktop/desktop/expected_snap.yaml
@@ -22,7 +22,7 @@ apps:
     command: usr/bin/appstream-desktop
     common-id: io.snapcraft.appstream
 confinement: strict
-grade: devel
+grade: stable
 environment:
   LD_LIBRARY_PATH: ${SNAP_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
   PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
diff --git a/tests/spread/core24/appstream-desktop/desktop/snap/snapcraft.yaml b/tests/spread/core24/appstream-desktop/desktop/snap/snapcraft.yaml
index 738fbbab8e..d39c5046ff 100644
--- a/tests/spread/core24/appstream-desktop/desktop/snap/snapcraft.yaml
+++ b/tests/spread/core24/appstream-desktop/desktop/snap/snapcraft.yaml
@@ -1,7 +1,6 @@
 name: appstream-desktop
 base: core24
 
-grade: devel
 confinement: strict
 adopt-info: appstream-desktop
 
diff --git a/tests/spread/core24/appstream-desktop/icon-desktop/expected_snap.yaml b/tests/spread/core24/appstream-desktop/icon-desktop/expected_snap.yaml
index 6826bfaead..8b4b15e543 100644
--- a/tests/spread/core24/appstream-desktop/icon-desktop/expected_snap.yaml
+++ b/tests/spread/core24/appstream-desktop/icon-desktop/expected_snap.yaml
@@ -22,7 +22,7 @@ apps:
     command: usr/bin/appstream-desktop
     common-id: io.snapcraft.appstream
 confinement: strict
-grade: devel
+grade: stable
 environment:
   LD_LIBRARY_PATH: ${SNAP_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
   PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
diff --git a/tests/spread/core24/appstream-desktop/icon-desktop/snap/snapcraft.yaml b/tests/spread/core24/appstream-desktop/icon-desktop/snap/snapcraft.yaml
index 738fbbab8e..d39c5046ff 100644
--- a/tests/spread/core24/appstream-desktop/icon-desktop/snap/snapcraft.yaml
+++ b/tests/spread/core24/appstream-desktop/icon-desktop/snap/snapcraft.yaml
@@ -1,7 +1,6 @@
 name: appstream-desktop
 base: core24
 
-grade: devel
 confinement: strict
 adopt-info: appstream-desktop
 
diff --git a/tests/spread/core24/clean/snaps/clean-with-long-name/snap/snapcraft.yaml b/tests/spread/core24/clean/snaps/clean-with-long-name/snap/snapcraft.yaml
index b4b443fd9c..5133411b00 100644
--- a/tests/spread/core24/clean/snaps/clean-with-long-name/snap/snapcraft.yaml
+++ b/tests/spread/core24/clean/snaps/clean-with-long-name/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: clean-i-am-40-characters-long-xxxxxxxxxx
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/clean/snaps/clean/snap/snapcraft.yaml b/tests/spread/core24/clean/snaps/clean/snap/snapcraft.yaml
index eedfff8b15..64c5dc68b2 100644
--- a/tests/spread/core24/clean/snaps/clean/snap/snapcraft.yaml
+++ b/tests/spread/core24/clean/snaps/clean/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: clean
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/components/expected-snap.yaml b/tests/spread/core24/components/expected-snap.yaml
index ec39cb42a2..74d9ae6d0e 100644
--- a/tests/spread/core24/components/expected-snap.yaml
+++ b/tests/spread/core24/components/expected-snap.yaml
@@ -9,7 +9,7 @@ apps:
   hello:
     command: bin/hello
 confinement: strict
-grade: devel
+grade: stable
 environment:
   LD_LIBRARY_PATH: ${SNAP_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
   PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
diff --git a/tests/spread/core24/components/snapcraft.yaml b/tests/spread/core24/components/snapcraft.yaml
index 591d288ce2..21839b59e7 100644
--- a/tests/spread/core24/components/snapcraft.yaml
+++ b/tests/spread/core24/components/snapcraft.yaml
@@ -3,7 +3,6 @@ version: "1.0"
 summary: Build a snap with components
 description: Build a snap with components
 base: core24
-grade: devel
 confinement: strict
 
 apps:
diff --git a/tests/spread/core24/content-interface-provider-found/snapcraft.yaml b/tests/spread/core24/content-interface-provider-found/snapcraft.yaml
index b8c501fa61..0061214868 100644
--- a/tests/spread/core24/content-interface-provider-found/snapcraft.yaml
+++ b/tests/spread/core24/content-interface-provider-found/snapcraft.yaml
@@ -5,7 +5,6 @@ description: |
   Defining a plug using the content interface should install the snap
   listed under default-provider.
 
-grade: devel
 base: core24
 confinement: devmode
 
diff --git a/tests/spread/core24/content-interface-provider-not-found/snapcraft.yaml b/tests/spread/core24/content-interface-provider-not-found/snapcraft.yaml
index 35a049bb3c..79804f2bb7 100644
--- a/tests/spread/core24/content-interface-provider-not-found/snapcraft.yaml
+++ b/tests/spread/core24/content-interface-provider-not-found/snapcraft.yaml
@@ -5,7 +5,6 @@ description: |
   Defining a plug using the content interface should only warn when it
   cannot find the snap listed under default-provider.
 
-grade: devel
 base: core24
 confinement: devmode
 
diff --git a/tests/spread/core24/craftctl/test-craftctl-default/snap/snapcraft.yaml b/tests/spread/core24/craftctl/test-craftctl-default/snap/snapcraft.yaml
index eb2170fdcc..578942fe00 100644
--- a/tests/spread/core24/craftctl/test-craftctl-default/snap/snapcraft.yaml
+++ b/tests/spread/core24/craftctl/test-craftctl-default/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: craftctl-default
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/grade/snapcraft.yaml b/tests/spread/core24/grade/snapcraft.yaml
new file mode 100644
index 0000000000..9a3e542b5b
--- /dev/null
+++ b/tests/spread/core24/grade/snapcraft.yaml
@@ -0,0 +1,13 @@
+name: grade-snap
+version: "1.0"
+summary: Build a snap to test the grade
+description: Build a snap to test the grade
+base: core24
+confinement: strict
+
+grade: stable
+
+parts:
+  hello:
+    source: .
+    plugin: nil
diff --git a/tests/spread/core24/grade/task.yaml b/tests/spread/core24/grade/task.yaml
new file mode 100644
index 0000000000..97d1dfdc59
--- /dev/null
+++ b/tests/spread/core24/grade/task.yaml
@@ -0,0 +1,18 @@
+summary: Set the grade of a snap
+
+environment:
+  SNAP_GRADE/stable: stable
+  SNAP_GRADE/devel: devel
+
+prepare: |
+  #shellcheck source=tests/spread/tools/snapcraft-yaml.sh
+  . "$TOOLS_DIR/snapcraft-yaml.sh"
+  set_grade "snapcraft.yaml" "${SNAP_GRADE}"
+
+restore: |
+  snapcraft clean --destructive-mode
+
+execute: |
+  snapcraft prime --destructive-mode
+
+  grep -q "grade: ${SNAP_GRADE}" prime/meta/snap.yaml
diff --git a/tests/spread/core24/grammar/snap/snapcraft.yaml b/tests/spread/core24/grammar/snap/snapcraft.yaml
index b00d353273..50707366a3 100644
--- a/tests/spread/core24/grammar/snap/snapcraft.yaml
+++ b/tests/spread/core24/grammar/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   Exercise snapcraft's advanced grammar keywords, `on`, and `to`.
   This test leverages the platform keywords, `build-on` and `build-for`.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/hooks/aux/build-aux/snap/snapcraft.yaml b/tests/spread/core24/hooks/aux/build-aux/snap/snapcraft.yaml
index f544115bd9..5977e3b290 100644
--- a/tests/spread/core24/hooks/aux/build-aux/snap/snapcraft.yaml
+++ b/tests/spread/core24/hooks/aux/build-aux/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ base: core24
 version: '1.0'
 summary: Test conflicting generated and project hooks.
 description: Project hooks in $PROJECT/snap/hooks/ should take priority over conflicting code generated hooks.
-grade: devel
 confinement: strict
 
 parts:
diff --git a/tests/spread/core24/hooks/default/snap/snapcraft.yaml b/tests/spread/core24/hooks/default/snap/snapcraft.yaml
index f544115bd9..5977e3b290 100644
--- a/tests/spread/core24/hooks/default/snap/snapcraft.yaml
+++ b/tests/spread/core24/hooks/default/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ base: core24
 version: '1.0'
 summary: Test conflicting generated and project hooks.
 description: Project hooks in $PROJECT/snap/hooks/ should take priority over conflicting code generated hooks.
-grade: devel
 confinement: strict
 
 parts:
diff --git a/tests/spread/core24/lifecycle/snapcraft.yaml b/tests/spread/core24/lifecycle/snapcraft.yaml
index 6b215a1c3e..8602ccb7bc 100644
--- a/tests/spread/core24/lifecycle/snapcraft.yaml
+++ b/tests/spread/core24/lifecycle/snapcraft.yaml
@@ -5,7 +5,6 @@ summary: snapcraft lifecycle
 description: |
   A test to ensure we can pull, build, stage and prime
 
-grade: devel
 confinement: strict
 
 apps:
diff --git a/tests/spread/core24/linters-file/lint-file/snapcraft.yaml b/tests/spread/core24/linters-file/lint-file/snapcraft.yaml
index 7ad7d9850e..c1c3c0539d 100644
--- a/tests/spread/core24/linters-file/lint-file/snapcraft.yaml
+++ b/tests/spread/core24/linters-file/lint-file/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Lint a packaged snapcraft file.
 description: spread test
 
-grade: devel
 confinement: strict
 
 parts:
diff --git a/tests/spread/core24/linters-pack/classic-libc/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/classic-libc/snap/snapcraft.yaml
index 10ea0572bd..47201f620a 100644
--- a/tests/spread/core24/linters-pack/classic-libc/snap/snapcraft.yaml
+++ b/tests/spread/core24/linters-pack/classic-libc/snap/snapcraft.yaml
@@ -8,7 +8,6 @@ description: |
   we live in tweetspace and your description wants to look good in the snap
   store.
 
-grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: strict
 
 lint:
diff --git a/tests/spread/core24/linters-pack/classic/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/classic/snap/snapcraft.yaml
index b8485a3608..58bdc57d40 100644
--- a/tests/spread/core24/linters-pack/classic/snap/snapcraft.yaml
+++ b/tests/spread/core24/linters-pack/classic/snap/snapcraft.yaml
@@ -8,7 +8,6 @@ description: |
   we live in tweetspace and your description wants to look good in the snap
   store.
 
-grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: classic
 
 lint:
diff --git a/tests/spread/core24/linters-pack/library-gnome/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-gnome/snap/snapcraft.yaml
index 21ad58e5b6..73203f52c7 100644
--- a/tests/spread/core24/linters-pack/library-gnome/snap/snapcraft.yaml
+++ b/tests/spread/core24/linters-pack/library-gnome/snap/snapcraft.yaml
@@ -20,7 +20,6 @@ description: |
   decimal, and hexadecimal), boolean algebra, one’s and two’s complementation,
   character to character code conversion, and more.
 
-grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/linters-pack/library-ignore-missing/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-ignore-missing/snap/snapcraft.yaml
index f2427e3953..d510a77d7a 100644
--- a/tests/spread/core24/linters-pack/library-ignore-missing/snap/snapcraft.yaml
+++ b/tests/spread/core24/linters-pack/library-ignore-missing/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Ignore missing library linter issues
 description: spread test
 
-grade: devel
 confinement: strict
 
 lint:
diff --git a/tests/spread/core24/linters-pack/library-ignore-unused/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-ignore-unused/snap/snapcraft.yaml
index fae8e6ca8e..67e791d295 100644
--- a/tests/spread/core24/linters-pack/library-ignore-unused/snap/snapcraft.yaml
+++ b/tests/spread/core24/linters-pack/library-ignore-unused/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Ignore unused library linter issues
 description: spread test
 
-grade: devel
 confinement: strict
 
 lint:
diff --git a/tests/spread/core24/linters-pack/library-ignored-mixed/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-ignored-mixed/snap/snapcraft.yaml
index f15630cc86..d98417e57f 100644
--- a/tests/spread/core24/linters-pack/library-ignored-mixed/snap/snapcraft.yaml
+++ b/tests/spread/core24/linters-pack/library-ignored-mixed/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Ignore a mix of unused and missing library linter issues
 description: spread test
 
-grade: devel
 confinement: strict
 
 lint:
diff --git a/tests/spread/core24/linters-pack/library-missing/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-missing/snap/snapcraft.yaml
index 0dc8399706..19fe4b07e3 100644
--- a/tests/spread/core24/linters-pack/library-missing/snap/snapcraft.yaml
+++ b/tests/spread/core24/linters-pack/library-missing/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Raise linter warnings for missing libraries
 description: spread test
 
-grade: devel
 confinement: strict
 
 parts:
diff --git a/tests/spread/core24/linters-pack/library-unused/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-unused/snap/snapcraft.yaml
index c3257780d0..71f62f0474 100644
--- a/tests/spread/core24/linters-pack/library-unused/snap/snapcraft.yaml
+++ b/tests/spread/core24/linters-pack/library-unused/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Raise linter warnings for unused libraries.
 description: spread test
 
-grade: devel
 confinement: strict
 
 parts:
diff --git a/tests/spread/core24/metadata-links/snapcraft.yaml b/tests/spread/core24/metadata-links/snapcraft.yaml
index de779980e3..a844bf7917 100644
--- a/tests/spread/core24/metadata-links/snapcraft.yaml
+++ b/tests/spread/core24/metadata-links/snapcraft.yaml
@@ -4,7 +4,6 @@ description: |
   Verify that top level metadata links in snapcraft.yaml are created at a top level
   links entry in snap.yaml.
 version: "1.0"
-grade: devel
 confinement: strict
 base: core24
 issues:
diff --git a/tests/spread/core24/package-repositories/test-apt-key-fingerprint/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-key-fingerprint/snap/snapcraft.yaml
index 3b74a3bef3..502f8ab677 100644
--- a/tests/spread/core24/package-repositories/test-apt-key-fingerprint/snap/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-apt-key-fingerprint/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-key-fingerprint
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/package-repositories/test-apt-key-name/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-key-name/snap/snapcraft.yaml
index 42bcba4fac..7c66f33f8c 100644
--- a/tests/spread/core24/package-repositories/test-apt-key-name/snap/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-apt-key-name/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-key-name
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/package-repositories/test-apt-keyserver/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-keyserver/snap/snapcraft.yaml
index d1e72115a6..9bbbc92dbf 100644
--- a/tests/spread/core24/package-repositories/test-apt-keyserver/snap/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-apt-keyserver/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-keyserver
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/package-repositories/test-apt-path/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-path/snap/snapcraft.yaml
index b4e5725384..da10b2186f 100644
--- a/tests/spread/core24/package-repositories/test-apt-path/snap/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-apt-path/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-ppa
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/package-repositories/test-apt-ppa/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-ppa/snap/snapcraft.yaml
index f6bc15ff99..427fc2885b 100644
--- a/tests/spread/core24/package-repositories/test-apt-ppa/snap/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-apt-ppa/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-ppa
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/package-repositories/test-foreign-armhf/snapcraft.yaml b/tests/spread/core24/package-repositories/test-foreign-armhf/snapcraft.yaml
index a03beaf093..fa2251c31a 100644
--- a/tests/spread/core24/package-repositories/test-foreign-armhf/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-foreign-armhf/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-foreign-armhf
 version: '1.0'
 summary: test package repos with different architectures
 description: test package repos with different architectures
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/package-repositories/test-foreign-i386/snapcraft.yaml b/tests/spread/core24/package-repositories/test-foreign-i386/snapcraft.yaml
index f44ead02c2..a2913b0c2f 100644
--- a/tests/spread/core24/package-repositories/test-foreign-i386/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-foreign-i386/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-foreign-i386
 version: '1.0'
 summary: test package repos with different architectures
 description: test package repos with different architectures
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/package-repositories/test-multi-keys/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-multi-keys/snap/snapcraft.yaml
index 661dda867e..6121b5953a 100644
--- a/tests/spread/core24/package-repositories/test-multi-keys/snap/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-multi-keys/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-multi-keys
 version: '1.0'
 summary: test
 description: test installing a package repository with an asset file with multiple keys
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/package-repositories/test-pin/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-pin/snap/snapcraft.yaml
index 338dfed69b..c4456cdc1c 100644
--- a/tests/spread/core24/package-repositories/test-pin/snap/snapcraft.yaml
+++ b/tests/spread/core24/package-repositories/test-pin/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-pin
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 
diff --git a/tests/spread/core24/packing/snap/snapcraft.yaml b/tests/spread/core24/packing/snap/snapcraft.yaml
index 86ce611e47..fa56341a49 100644
--- a/tests/spread/core24/packing/snap/snapcraft.yaml
+++ b/tests/spread/core24/packing/snap/snapcraft.yaml
@@ -8,7 +8,6 @@ description: |
   store.
 base: core24
 
-grade: devel
 confinement: devmode
 
 parts:
diff --git a/tests/spread/core24/platforms/snaps/build-for-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/build-for-match/snap/snapcraft.yaml
index d9d6226222..da5277787a 100644
--- a/tests/spread/core24/platforms/snaps/build-for-match/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/build-for-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   Only snaps should be built where `build-for` matches the
   command line argument `--build-for <architecture>`.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/platforms/snaps/build-for-no-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/build-for-no-match/snap/snapcraft.yaml
index 13a849fc3f..888ea7fe49 100644
--- a/tests/spread/core24/platforms/snaps/build-for-no-match/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/build-for-no-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   No snaps should be built if there no `build-for` that matches
   command line argument `--build-for <architecture>`.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/platforms/snaps/build-on-no-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/build-on-no-match/snap/snapcraft.yaml
index 0d4ae706d8..2484519e09 100644
--- a/tests/spread/core24/platforms/snaps/build-on-no-match/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/build-on-no-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   When build-on doesn't match the host architecture,
   no snaps should be built.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/platforms/snaps/env-var-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/env-var-match/snap/snapcraft.yaml
index 90cde05bb1..d6c9bb405f 100644
--- a/tests/spread/core24/platforms/snaps/env-var-match/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/env-var-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   Only snaps should be built where `build-for` matches the
   environmental variable `SNAPCRAFT_BUILD_FOR`.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/platforms/snaps/env-var-no-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/env-var-no-match/snap/snapcraft.yaml
index 30d9a3488c..83db4da3db 100644
--- a/tests/spread/core24/platforms/snaps/env-var-no-match/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/env-var-no-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   No snaps should be built if there no `build-for`
   matches the environmental variable `SNAPCRAFT_BUILD_FOR`.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/platforms/snaps/multiple-build-for/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/multiple-build-for/snap/snapcraft.yaml
index 208d47a051..5779ff562c 100644
--- a/tests/spread/core24/platforms/snaps/multiple-build-for/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/multiple-build-for/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ version: "1.0"
 summary: test
 description: |
   Building on amd64 would match two snaps, so the "naked" build should fail.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/platforms/snaps/platform-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/platform-match/snap/snapcraft.yaml
index e292a91078..2b74d7992c 100644
--- a/tests/spread/core24/platforms/snaps/platform-match/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/platform-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   Only snaps should be built where `platform` matches the
   command line argument `--platform <platform>`.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/platforms/snaps/platform-no-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/platform-no-match/snap/snapcraft.yaml
index c5c9ecafe5..770d870e9d 100644
--- a/tests/spread/core24/platforms/snaps/platform-no-match/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/platform-no-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   No snaps should be built if there no `platform` that matches
   command line argument `--platform <platform>`.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/platforms/snaps/single-arch/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/single-arch/snap/snapcraft.yaml
index aef0e08fbc..be36258dca 100644
--- a/tests/spread/core24/platforms/snaps/single-arch/snap/snapcraft.yaml
+++ b/tests/spread/core24/platforms/snaps/single-arch/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ version: "1.0"
 summary: test
 description: |
   A single platform should create a single snap file.
-grade: devel
 confinement: strict
 base: core24
 platforms:
diff --git a/tests/spread/core24/plugs-warn/snap/snapcraft.yaml b/tests/spread/core24/plugs-warn/snap/snapcraft.yaml
index 1e7907dbf4..1be35b8234 100644
--- a/tests/spread/core24/plugs-warn/snap/snapcraft.yaml
+++ b/tests/spread/core24/plugs-warn/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Check warnings for top-level enabling of slots and plugs
 description: Check warnings for top-level enabling of slots and plugs.
 
-grade: devel
 confinement: strict
 
 plugs:
diff --git a/tests/spread/core24/root-packages/snapcraft.yaml b/tests/spread/core24/root-packages/snapcraft.yaml
index 5c75a54c07..099033008d 100644
--- a/tests/spread/core24/root-packages/snapcraft.yaml
+++ b/tests/spread/core24/root-packages/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test build-snaps and build-packages at the root
 description: verify that these keys are processed correctly
 base: core24
 confinement: strict
-grade: devel
 
 build-packages: [hello]
 build-snaps: [hello]
diff --git a/tests/spread/core24/set-version-twice/modified-snapcraft.yaml b/tests/spread/core24/set-version-twice/modified-snapcraft.yaml
index d864acf4a9..216df4fcef 100644
--- a/tests/spread/core24/set-version-twice/modified-snapcraft.yaml
+++ b/tests/spread/core24/set-version-twice/modified-snapcraft.yaml
@@ -8,7 +8,6 @@ description: |
   such as `version`. Make sure this scenario builds correctly.
 adopt-info: part1
 
-grade: devel
 confinement: devmode
 
 parts:
diff --git a/tests/spread/core24/set-version-twice/original-snapcraft.yaml b/tests/spread/core24/set-version-twice/original-snapcraft.yaml
index 25ae939f68..49db00c152 100644
--- a/tests/spread/core24/set-version-twice/original-snapcraft.yaml
+++ b/tests/spread/core24/set-version-twice/original-snapcraft.yaml
@@ -8,7 +8,6 @@ description: |
   such as `version`. Make sure this scenario builds correctly.
 adopt-info: part1
 
-grade: devel
 confinement: devmode
 
 parts:
diff --git a/tests/spread/core24/simple-snap/snap/snapcraft.yaml b/tests/spread/core24/simple-snap/snap/snapcraft.yaml
index 2fec11ba1c..4d211a639a 100644
--- a/tests/spread/core24/simple-snap/snap/snapcraft.yaml
+++ b/tests/spread/core24/simple-snap/snap/snapcraft.yaml
@@ -6,7 +6,6 @@ description: |
 
 base: core24
 
-grade: devel
 confinement: strict
 
 apps:
@@ -21,4 +20,4 @@ parts:
       - gcc
       - libc-dev
       - libcurl4-openssl-dev
-    stage-packages: [libcurl4]
\ No newline at end of file
+    stage-packages: [libcurl4]
diff --git a/tests/spread/core24/snap-creation/package-cutoff/snap/snapcraft.yaml b/tests/spread/core24/snap-creation/package-cutoff/snap/snapcraft.yaml
index 779e3e8c38..b84ab422d0 100644
--- a/tests/spread/core24/snap-creation/package-cutoff/snap/snapcraft.yaml
+++ b/tests/spread/core24/snap-creation/package-cutoff/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ base: core24
 version: '1.0'
 summary: 'test'
 description: test
-grade: devel
 confinement: devmode
 
 # The parts defined here will be in conflict if the package-cutoff is not working;