diff --git a/classes/no-spdx.bbclass b/classes/no-spdx.bbclass
deleted file mode 100644
index dcc1548fa..000000000
--- a/classes/no-spdx.bbclass
+++ /dev/null
@@ -1,13 +0,0 @@
-## SPDX-License-Identifier: BSD-2-Clause
-## Copyright (c) 2023, Konrad Weihmann
-
-# This disables creating expensive SBOMs
-# which just consume space and don't serve
-# any purpose for our test distro
-
-do_collect_spdx_deps[noexec] = "1"
-do_create_spdx[noexec] = "1"
-do_create_spdx_setscene[noexec] = "1"
-do_create_runtime_spdx[noexec] = "1"
-
-ROOTFS_POSTUNINSTALL_COMMAND:remove = "image_combine_spdx"
diff --git a/conf/distro/scatest.conf b/conf/distro/scatest.conf
index ffbde45d5..723b11c57 100644
--- a/conf/distro/scatest.conf
+++ b/conf/distro/scatest.conf
@@ -39,4 +39,4 @@ INHERIT += "rm_work"
 INHERIT += "no-native-pycache"
 
 # Disable SPDX
-INHERIT += "no-spdx"
+INHERIT += "nospdx"