diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/STAGE2-redhat-rpm-config b/SOURCES/STAGE2-redhat-rpm-config
similarity index 100%
rename from STAGE2-redhat-rpm-config
rename to SOURCES/STAGE2-redhat-rpm-config
diff --git a/brp-implant-ident-static b/SOURCES/brp-implant-ident-static
similarity index 100%
rename from brp-implant-ident-static
rename to SOURCES/brp-implant-ident-static
diff --git a/brp-java-repack-jars b/SOURCES/brp-java-repack-jars
similarity index 100%
rename from brp-java-repack-jars
rename to SOURCES/brp-java-repack-jars
diff --git a/brp-ldconfig b/SOURCES/brp-ldconfig
similarity index 100%
rename from brp-ldconfig
rename to SOURCES/brp-ldconfig
diff --git a/brp-llvm-compile-lto-elf b/SOURCES/brp-llvm-compile-lto-elf
similarity index 100%
rename from brp-llvm-compile-lto-elf
rename to SOURCES/brp-llvm-compile-lto-elf
diff --git a/brp-mangle-shebangs b/SOURCES/brp-mangle-shebangs
similarity index 100%
rename from brp-mangle-shebangs
rename to SOURCES/brp-mangle-shebangs
diff --git a/brp-strip-lto b/SOURCES/brp-strip-lto
similarity index 100%
rename from brp-strip-lto
rename to SOURCES/brp-strip-lto
diff --git a/buildflags.md b/SOURCES/buildflags.md
similarity index 100%
rename from buildflags.md
rename to SOURCES/buildflags.md
diff --git a/ci.fmf b/SOURCES/ci.fmf
similarity index 100%
rename from ci.fmf
rename to SOURCES/ci.fmf
diff --git a/common.lua b/SOURCES/common.lua
similarity index 100%
rename from common.lua
rename to SOURCES/common.lua
diff --git a/config.guess b/SOURCES/config.guess
similarity index 100%
rename from config.guess
rename to SOURCES/config.guess
diff --git a/config.sub b/SOURCES/config.sub
similarity index 100%
rename from config.sub
rename to SOURCES/config.sub
diff --git a/dist.sh b/SOURCES/dist.sh
similarity index 100%
rename from dist.sh
rename to SOURCES/dist.sh
diff --git a/find-provides b/SOURCES/find-provides
similarity index 100%
rename from find-provides
rename to SOURCES/find-provides
diff --git a/find-requires b/SOURCES/find-requires
similarity index 100%
rename from find-requires
rename to SOURCES/find-requires
diff --git a/gating.yaml b/SOURCES/gating.yaml
similarity index 100%
rename from gating.yaml
rename to SOURCES/gating.yaml
diff --git a/gpgverify b/SOURCES/gpgverify
similarity index 100%
rename from gpgverify
rename to SOURCES/gpgverify
diff --git a/libsymlink.attr b/SOURCES/libsymlink.attr
similarity index 100%
rename from libsymlink.attr
rename to SOURCES/libsymlink.attr
diff --git a/macros b/SOURCES/macros
similarity index 99%
rename from macros
rename to SOURCES/macros
index e96b4e8..6fdceb8 100644
--- a/macros
+++ b/SOURCES/macros
@@ -5,7 +5,7 @@
 #
 %_vendor		redhat
 %_os			linux
-%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
+%_target_platform	x86_64-%{_vendor}-%{_target_os}%{?_gnu}
 
 #==============================================================================
 # ---- configure macros.  note that most of these are inherited
diff --git a/macros.build-constraints b/SOURCES/macros.build-constraints
similarity index 100%
rename from macros.build-constraints
rename to SOURCES/macros.build-constraints
diff --git a/macros.dwz b/SOURCES/macros.dwz
similarity index 100%
rename from macros.dwz
rename to SOURCES/macros.dwz
diff --git a/macros.fedora-misc b/SOURCES/macros.fedora-misc
similarity index 100%
rename from macros.fedora-misc
rename to SOURCES/macros.fedora-misc
diff --git a/macros.fedora-misc-srpm b/SOURCES/macros.fedora-misc-srpm
similarity index 100%
rename from macros.fedora-misc-srpm
rename to SOURCES/macros.fedora-misc-srpm
diff --git a/macros.gap-srpm b/SOURCES/macros.gap-srpm
similarity index 100%
rename from macros.gap-srpm
rename to SOURCES/macros.gap-srpm
diff --git a/macros.java-srpm b/SOURCES/macros.java-srpm
similarity index 100%
rename from macros.java-srpm
rename to SOURCES/macros.java-srpm
diff --git a/macros.ldc-srpm b/SOURCES/macros.ldc-srpm
similarity index 100%
rename from macros.ldc-srpm
rename to SOURCES/macros.ldc-srpm
diff --git a/macros.ldconfig b/SOURCES/macros.ldconfig
similarity index 100%
rename from macros.ldconfig
rename to SOURCES/macros.ldconfig
diff --git a/macros.mono-srpm b/SOURCES/macros.mono-srpm
similarity index 100%
rename from macros.mono-srpm
rename to SOURCES/macros.mono-srpm
diff --git a/macros.nodejs-srpm b/SOURCES/macros.nodejs-srpm
similarity index 100%
rename from macros.nodejs-srpm
rename to SOURCES/macros.nodejs-srpm
diff --git a/macros.rpmautospec b/SOURCES/macros.rpmautospec
similarity index 100%
rename from macros.rpmautospec
rename to SOURCES/macros.rpmautospec
diff --git a/macros.shell-completions b/SOURCES/macros.shell-completions
similarity index 100%
rename from macros.shell-completions
rename to SOURCES/macros.shell-completions
diff --git a/macros.valgrind-srpm b/SOURCES/macros.valgrind-srpm
similarity index 100%
rename from macros.valgrind-srpm
rename to SOURCES/macros.valgrind-srpm
diff --git a/macros.vpath b/SOURCES/macros.vpath
similarity index 100%
rename from macros.vpath
rename to SOURCES/macros.vpath
diff --git a/redhat-annobin-cc1 b/SOURCES/redhat-annobin-cc1
similarity index 100%
rename from redhat-annobin-cc1
rename to SOURCES/redhat-annobin-cc1
diff --git a/redhat-annobin-plugin-select.sh b/SOURCES/redhat-annobin-plugin-select.sh
similarity index 100%
rename from redhat-annobin-plugin-select.sh
rename to SOURCES/redhat-annobin-plugin-select.sh
diff --git a/redhat-annobin-select-annobin-built-plugin b/SOURCES/redhat-annobin-select-annobin-built-plugin
similarity index 100%
rename from redhat-annobin-select-annobin-built-plugin
rename to SOURCES/redhat-annobin-select-annobin-built-plugin
diff --git a/redhat-annobin-select-gcc-built-plugin b/SOURCES/redhat-annobin-select-gcc-built-plugin
similarity index 100%
rename from redhat-annobin-select-gcc-built-plugin
rename to SOURCES/redhat-annobin-select-gcc-built-plugin
diff --git a/redhat-hardened-cc1 b/SOURCES/redhat-hardened-cc1
similarity index 100%
rename from redhat-hardened-cc1
rename to SOURCES/redhat-hardened-cc1
diff --git a/redhat-hardened-clang-ld.cfg b/SOURCES/redhat-hardened-clang-ld.cfg
similarity index 100%
rename from redhat-hardened-clang-ld.cfg
rename to SOURCES/redhat-hardened-clang-ld.cfg
diff --git a/redhat-hardened-clang.cfg b/SOURCES/redhat-hardened-clang.cfg
similarity index 100%
rename from redhat-hardened-clang.cfg
rename to SOURCES/redhat-hardened-clang.cfg
diff --git a/redhat-hardened-ld b/SOURCES/redhat-hardened-ld
similarity index 100%
rename from redhat-hardened-ld
rename to SOURCES/redhat-hardened-ld
diff --git a/redhat-hardened-ld-errors b/SOURCES/redhat-hardened-ld-errors
similarity index 100%
rename from redhat-hardened-ld-errors
rename to SOURCES/redhat-hardened-ld-errors
diff --git a/rpmlint.cf b/SOURCES/rpmlint.cf
similarity index 100%
rename from rpmlint.cf
rename to SOURCES/rpmlint.cf
diff --git a/rpmrc b/SOURCES/rpmrc
similarity index 100%
rename from rpmrc
rename to SOURCES/rpmrc
diff --git a/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec
similarity index 99%
rename from redhat-rpm-config.spec
rename to SPECS/redhat-rpm-config.spec
index 39ad195..1bd6a5f 100644
--- a/redhat-rpm-config.spec
+++ b/SPECS/redhat-rpm-config.spec
@@ -9,7 +9,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: %{baserelease}
-Release: 1%{?dist}
+Release: 1%{?dist}.alma.1
 # config.guess, config.sub are GPL-3.0-or-later WITH Autoconf-exception-generic
 License: GPL-1.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later WITH Autoconf-exception-generic AND Boehm-GC
 URL: https://src.fedoraproject.org/rpms/redhat-rpm-config
diff --git a/plans/internal/CI-Tier-1.fmf b/plans/internal/CI-Tier-1.fmf
deleted file mode 100644
index 59cd245..0000000
--- a/plans/internal/CI-Tier-1.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: Internal CI-Tier-1 tests plan
-discover:
-  - name: redhat-rpm-config 
-    how: fmf
-    filter: 'tag: CI-Tier-1'
-    url: https://pkgs.devel.redhat.com/git/tests/redhat-rpm-config
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
-
diff --git a/sources b/sources
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/auto-set-build-flags/Makefile b/tests/auto-set-build-flags/Makefile
deleted file mode 100644
index ddf3d76..0000000
--- a/tests/auto-set-build-flags/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-.phony: all
-
-all: hello-c hello-cpp
-
-clean:
-	rm -Rf *.o hello-c hello-cpp
-
-hello-c: main-c.o hello-c.o
-
-hello-cpp: main-cpp.o hello-cpp.o
-	$(CXX) $(LDFLAGS) -o $@ $^
diff --git a/tests/auto-set-build-flags/hello-c.c b/tests/auto-set-build-flags/hello-c.c
deleted file mode 100644
index fbc4d72..0000000
--- a/tests/auto-set-build-flags/hello-c.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdio.h>
-
-void hello(void) {
-    printf("Hello, World!");
-}
diff --git a/tests/auto-set-build-flags/hello-cpp.cpp b/tests/auto-set-build-flags/hello-cpp.cpp
deleted file mode 100644
index e925107..0000000
--- a/tests/auto-set-build-flags/hello-cpp.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <iostream>
-
-void hello(void) {
-    std::cout << "Hello, World!\n";
-}
diff --git a/tests/auto-set-build-flags/main-c.c b/tests/auto-set-build-flags/main-c.c
deleted file mode 100644
index 543bba3..0000000
--- a/tests/auto-set-build-flags/main-c.c
+++ /dev/null
@@ -1,5 +0,0 @@
-void hello(void);
-
-int main(int argc, char **argv) {
-    hello();
-}
diff --git a/tests/auto-set-build-flags/main-cpp.cpp b/tests/auto-set-build-flags/main-cpp.cpp
deleted file mode 100644
index 543bba3..0000000
--- a/tests/auto-set-build-flags/main-cpp.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-void hello(void);
-
-int main(int argc, char **argv) {
-    hello();
-}
diff --git a/tests/auto-set-build-flags/main.fmf b/tests/auto-set-build-flags/main.fmf
deleted file mode 100644
index aeb1b86..0000000
--- a/tests/auto-set-build-flags/main.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: >
-  Check the that the environment variables for build flags are automatically set
-  https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck
-
-require:
-  - annobin-annocheck
-  - dnf5-plugins
-  - gcc
-  - gcc-c++
-  - make
-
-test: ./runtest.sh
diff --git a/tests/auto-set-build-flags/runtest.sh b/tests/auto-set-build-flags/runtest.sh
deleted file mode 100755
index ca0279d..0000000
--- a/tests/auto-set-build-flags/runtest.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-dnf -y builddep test.spec
-rpmbuild --define '_sourcedir .' --define '_builddir .' -bi test.spec
-rpmbuild --without auto_set_build_flags --define '_sourcedir .' --define '_builddir .' -bi test.spec
diff --git a/tests/auto-set-build-flags/test.spec b/tests/auto-set-build-flags/test.spec
deleted file mode 100644
index 1172eeb..0000000
--- a/tests/auto-set-build-flags/test.spec
+++ /dev/null
@@ -1,39 +0,0 @@
-%bcond_without auto_set_build_flags
-
-%if %{without auto_set_build_flags}
-%undefine _auto_set_build_flags
-%endif
-
-Name: test
-Version: 1
-Release: 1
-Summary: Test package for checking %%set_build_flag usage
-License: MIT
-
-BuildRequires: gcc gcc-c++ make
-BuildRequires: annobin-annocheck
-
-Source0: Makefile
-Source1: main-c.c
-Source2: hello-c.c
-Source3: main-cpp.cpp
-Source4: hello-cpp.cpp
-
-%global build_and_check \
-	make \
-	%{!?with_auto_set_build_flags:!} annocheck hello-c hello-cpp \
-	make clean
-
-%description
-Test package for checking %%set_build_flag usage
-
-%prep
-
-%build
-%build_and_check
-
-%check 
-%build_and_check
-
-%install
-%build_and_check
diff --git a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.c b/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.c
deleted file mode 100644
index 851790f..0000000
--- a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdio.h>
-
-void hello(void) {
-    printf("Hello, world!\n");
-}
diff --git a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.h b/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.h
deleted file mode 100644
index ef77476..0000000
--- a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.h
+++ /dev/null
@@ -1 +0,0 @@
-void hello(void);
diff --git a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.spec b/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.spec
deleted file mode 100644
index 52a6c1f..0000000
--- a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test-lib/brp-llvm-compile-lto-elf-test-lib.spec
+++ /dev/null
@@ -1,36 +0,0 @@
-Name: brp-llvm-compile-lto-elf-test-lib
-Version: 1
-Release: 1
-Summary: Library package for testing brp-llvm-compile-lto-elf
-License: MIT
-
-BuildRequires: clang binutils
-Source0: %{name}.c
-Source1: %{name}.h
-
-# FIXME: I'm not sure why this doesn't work
-%undefine _package_note_file
-
-%global toolchain clang
-
-%description
-%{summary}
-
-%build
-
-clang ${CFLAGS} -c %{SOURCE0} -o %{name}.o
-ar cr %{name}.a %{name}.o
-ranlib %{name}.a
-
-%install
-mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}%{_includedir}
-
-%{__install} -p -m 644 -t %{buildroot}%{_libdir} %{name}.o
-%{__install} -p -m 644 -t %{buildroot}%{_libdir} %{name}.a
-%{__install} -p -m 644 -t %{buildroot}%{_includedir} %{SOURCE1}
-
-%files
-%{_libdir}/%{name}.o
-%{_libdir}/%{name}.a
-%{_includedir}/%{name}.h
diff --git a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test/brp-llvm-compile-lto-elf-test.c b/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test/brp-llvm-compile-lto-elf-test.c
deleted file mode 100644
index eab7d69..0000000
--- a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test/brp-llvm-compile-lto-elf-test.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <brp-llvm-compile-lto-elf-test-lib.h>
-
-int main(int argc, char **argv) {
-  hello();
-  return 0;
-}
diff --git a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test/brp-llvm-compile-lto-elf-test.spec b/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test/brp-llvm-compile-lto-elf-test.spec
deleted file mode 100644
index 595030b..0000000
--- a/tests/brp-llvm-compile-lto-elf/brp-llvm-compile-lto-elf-test/brp-llvm-compile-lto-elf-test.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name: brp-llvm-compile-lto-elf-test
-Version: 1
-Release: 1
-Summary: Library package for testing brp-llvm-compile-lto-elf
-License: MIT
-
-BuildRequires: gcc
-BuildRequires: brp-llvm-compile-lto-elf-test-lib
-
-Source0: %{name}.c
-
-# FIXME: I'm not sure why this doesn't work
-%undefine _package_note_file
-
-
-%description
-%{summary}
-
-%build
-gcc ${CFLAGS} -c %{SOURCE0} -o %{name}.o
-gcc ${LDFLAGS} %{name}.o %{_libdir}/%{name}-lib.a -o %{name}-ar
-gcc ${LDFLAGS} %{name}.o %{_libdir}/%{name}-lib.o -o %{name}-obj
-
-%check
-./%{name}-ar | grep "Hello, world!"
-./%{name}-obj | grep "Hello, world!"
diff --git a/tests/brp-llvm-compile-lto-elf/main.fmf b/tests/brp-llvm-compile-lto-elf/main.fmf
deleted file mode 100644
index 19e8d13..0000000
--- a/tests/brp-llvm-compile-lto-elf/main.fmf
+++ /dev/null
@@ -1,9 +0,0 @@
-Summary: Test that the brp-llvm-compile-lto-elf script is working correctly
-
-require:
-  - dnf-plugins-core
-  - dnf5-plugins
-  - redhat-rpm-config
-  - rpm-build
-
-test: ./runtest.sh
diff --git a/tests/brp-llvm-compile-lto-elf/runtest.sh b/tests/brp-llvm-compile-lto-elf/runtest.sh
deleted file mode 100755
index d152bda..0000000
--- a/tests/brp-llvm-compile-lto-elf/runtest.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-lib_dir=brp-llvm-compile-lto-elf-test-lib
-lib_spec=$lib_dir/brp-llvm-compile-lto-elf-test-lib.spec
-
-dnf -y builddep $lib_spec 
-rpmbuild --define "_sourcedir ." --define "_builddir ./$lib_dir" --define "_rpmdir ."  -bb $lib_spec
-
-dnf -y install ./`rpm --eval '%{_arch}'`/*.rpm
-
-test_dir=brp-llvm-compile-lto-elf-test
-test_spec=$test_dir/brp-llvm-compile-lto-elf-test.spec
-
-dnf -y builddep $test_spec
-rpmbuild --define "_sourcedir ." --define "_builddir ./$test_dir" -bi $test_spec
diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf
deleted file mode 100644
index 5396575..0000000
--- a/tests/build-gating.fmf
+++ /dev/null
@@ -1,21 +0,0 @@
-summary: Tests
-discover:
-  - name: redhat-rpm-config-tests
-    how: fmf
-  - name: gcc-fedora-flags
-    how: fmf
-    url: https://src.fedoraproject.org/rpms/gcc.git
-    ref: rawhide
-    test: fedora-flags
-  - name: clang-fedora-flags
-    how: fmf
-    url: https://src.fedoraproject.org/rpms/clang.git
-    ref: rawhide
-    test: fedora-flags
-  - name: clang-fedora-pie-rpm
-    how: fmf
-    url: https://src.fedoraproject.org/tests/clang.git
-    ref: main
-    test: pie-rpm
-execute:
-  how: tmt
diff --git a/tests/build-self/main.fmf b/tests/build-self/main.fmf
deleted file mode 100644
index 12e1e5c..0000000
--- a/tests/build-self/main.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: self-build test
-
-require:
-  - dnf-plugins-core
-  - dnf5-plugins
-  - rpm-build
-test: ./runtest.sh
diff --git a/tests/build-self/runtest.sh b/tests/build-self/runtest.sh
deleted file mode 100755
index 0b7ef72..0000000
--- a/tests/build-self/runtest.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-spec=$TMT_TREE/redhat-rpm-config.spec
-dnf -y builddep $spec
-rpmbuild --define "_sourcedir $TMT_TREE" -ba $spec
diff --git a/tests/characters-in-flags/main.fmf b/tests/characters-in-flags/main.fmf
deleted file mode 100644
index 5654cd3..0000000
--- a/tests/characters-in-flags/main.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Test to ensure there aren't extraneous characters in build flags
-require:
-  - redhat-rpm-config
-test: ./runtest.sh
-
diff --git a/tests/characters-in-flags/runtest.sh b/tests/characters-in-flags/runtest.sh
deleted file mode 100755
index 0140913..0000000
--- a/tests/characters-in-flags/runtest.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-for f in %{build_cflags} %{build_cxxflags} %{build_fflags} %{build_ldflags}; do
-  rpm --eval "$f" | grep -vP '\t'
-done
diff --git a/tests/distro-extra-flags/main.fmf b/tests/distro-extra-flags/main.fmf
deleted file mode 100644
index 496e8c7..0000000
--- a/tests/distro-extra-flags/main.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: >
-  Check that the %_distro_extra_* macros allow users to append new flags to the
-  list of default flags.
-
-require:
-  - rpm
-
-test: ./runtest.sh
diff --git a/tests/distro-extra-flags/runtest.sh b/tests/distro-extra-flags/runtest.sh
deleted file mode 100755
index 09105b0..0000000
--- a/tests/distro-extra-flags/runtest.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -ex
-
-rpm -D '%_distro_extra_cflags -Wall' -E %{build_cflags} | grep -e '\-Wall$'
-rpm -D '%_distro_extra_cxxflags -Wall' -E %{build_cxxflags} | grep -e '\-Wall$'
-rpm -D '%_distro_extra_ldflags -Wall' -E %{build_ldflags} | grep -e '\-Wall$'
-rpm -D '%_distro_extra_fflags -Wall' -E %{build_fflags} | grep -e '\-Wall$'
diff --git a/tests/extension-builder-flags/main.fmf b/tests/extension-builder-flags/main.fmf
deleted file mode 100644
index b7b7c54..0000000
--- a/tests/extension-builder-flags/main.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Test that the extension builder flags contain the proper flags
-require:
-  - redhat-rpm-config
-test: ./runtest.sh
-
diff --git a/tests/extension-builder-flags/runtest.sh b/tests/extension-builder-flags/runtest.sh
deleted file mode 100755
index a54cb09..0000000
--- a/tests/extension-builder-flags/runtest.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -ex
-# Verify that the extension builder flags are stripped of non-required flags.
-# The flags may appear in random order due to being accessed through a lua
-# associative array.
-for f in %{extension_cflags} %{extension_cxxflags} %{extension_fflags}; do
-  [[ $(rpm --eval "$f") =~ ^[[:space:]]*(-fexceptions -fcf-protection|-fcf-protection -fexceptions)[[:space:]]*$ ]]
-done
-# The extension ldflag should always be empty
-[[ -z $(rpm --eval "%extension_ldflags") ]]
diff --git a/tests/include-frame-pointers/main.fmf b/tests/include-frame-pointers/main.fmf
deleted file mode 100644
index a41b1a9..0000000
--- a/tests/include-frame-pointers/main.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Test that conditional support for frame pointers works
-
-require:
-  - grep
-  - redhat-rpm-config
-  - rpm
-test: ./runtest.sh
diff --git a/tests/include-frame-pointers/runtest.sh b/tests/include-frame-pointers/runtest.sh
deleted file mode 100755
index bd5bf3a..0000000
--- a/tests/include-frame-pointers/runtest.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# Not using set -e on purpose as we manually validate the exit codes to print
-# useful messages.
-set -u
-
-passed=0
-failed=0
-
-rpmeval() {
-  # Note: --eval needs to always be *last* here
-  rpm "$@" --eval='%optflags'
-}
-
-validate() {
-  ret=$?
-  if [ $ret -eq 0 ]; then
-    echo "PASS: $*"
-    passed=$((passed+1))
-  else
-    echo "FAIL: $*"
-    failed=$((failed+1))
-  fi
-}
-
-for arch in aarch64 x86_64 riscv64; do
-  case "$arch" in
-    x86_64|aarch64)
-      flags='-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer'
-      ;;
-    *)
-      flags='-fno-omit-frame-pointer'
-      ;;
-  esac
-
-  rpmeval --target="${arch}-linux" --define='_include_frame_pointers 1' | grep -q -- "$flags"
-  validate "[${arch}] Test that the flags are included if the macro is defined"
-
-  rpmeval --target="${arch}-linux" --undefine='_include_frame_pointers' | grep -qv -- "$flags"
-  validate "[${arch}] Test that the flags are _not_ included if the macro is undefined"
-
-  rpmeval --target="${arch}-linux" --define='fedora 1' | grep -q -- "$flags"
-  validate "[${arch}] Test that the flags are included by default on Fedora"
-
-  rpmeval --target="${arch}-linux" --define='rhel 1' | grep -qv -- "$flags"
-  validate "[${arch}] Test that the flags are _not_ included by default on RHEL"
-done
-
-flags='-fno-omit-frame-pointer'
-for arch in i386 i486 i586 i686 athlon ppc64le s390x; do
-  rpmeval --target="${arch}-linux" --define='_include_frame_pointers 1' | grep -qv -- "$flags"
-  validate "[${arch}] Test that the flags are not included if the macro is defined"
-
-  rpmeval --target="${arch}-linux" | grep -qv -- "$flags"
-  validate "[${arch}] Test that the flags are not included by default"
-done
-
-echo
-echo "${passed} passed, ${failed} failed"
-
-exit "$failed"
diff --git a/tests/no-new-dependency/main.fmf b/tests/no-new-dependency/main.fmf
deleted file mode 100644
index 4edbb14..0000000
--- a/tests/no-new-dependency/main.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: Test that we don't accidently introduce any new dependencies.
-
-require:
-  - diffutils
-  - grep
-  - redhat-rpm-config
-  - rpm
-test: ./runtest.sh
diff --git a/tests/no-new-dependency/requires.txt b/tests/no-new-dependency/requires.txt
deleted file mode 100644
index b127062..0000000
--- a/tests/no-new-dependency/requires.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-coreutils
-dwz
-rpm
-zip
-/bin/sh
-/usr/bin/bash
-/usr/bin/file
-/usr/bin/find
-/usr/bin/grep
-/usr/bin/sed
-/usr/bin/sh
-/usr/bin/xargs
diff --git a/tests/no-new-dependency/runtest.sh b/tests/no-new-dependency/runtest.sh
deleted file mode 100755
index cb92a9c..0000000
--- a/tests/no-new-dependency/runtest.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash -ex
-
-# we diff most of the dependencies against our list in requires.txt
-# generally, a new dependency is bad, for exceptional cases, we can add it to the list together with the change
-# we intentionally grep out:
-#  -srpm-macros and -rpm-macros
-#  rpmlib(...)
-#  conditional dependencies (they contain if)
-# at the end, we strip the versions with cut
-diff -u <(cat $(dirname $0)/requires.txt | sort | uniq) \
-        <(rpm -q --requires redhat-rpm-config | grep -Ev -- '-s?rpm-macros(\s|$)|^rpmlib\(|\sif\s' | cut -d' ' -f1 | sort | uniq)
diff --git a/tests/rustflags/main.fmf b/tests/rustflags/main.fmf
deleted file mode 100644
index 02226e2..0000000
--- a/tests/rustflags/main.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Test that conditional support for RUSTFLAGS works
-
-require:
-  - redhat-rpm-config
-  - rpm
-  - rust-packaging
-test: ./runtest.sh
diff --git a/tests/rustflags/runtest.sh b/tests/rustflags/runtest.sh
deleted file mode 100755
index b6a3be0..0000000
--- a/tests/rustflags/runtest.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/bash
-set -e -u -o pipefail
-
-# Allow for local testing
-rargs=()
-if [ -n "${MACROS_PATH:-}" ]; then
-    default_macros_path="$(rpm --showrc | grep 'Macro path' | awk -F ': ' '{print $2}')"
-    rargs+=("--macros" "${default_macros_path}:${MACROS_PATH}")
-fi
-
-build_rustflags="$(rpm -E '%{build_rustflags}')"
-# For good measure
-[ "${build_rustflags}" != "%{build_rustflags}" ]
-#
-flags="$(rpm "${rargs[@]}" -E '%set_build_flags')"
-
-echo 'Check that RUSTFLAGS is set after evaluating %set_build_flags'
-(
-    eval "${flags}"
-    # set -u will make this fail if $RUSTFLAGS isn't defined
-    [ "${RUSTFLAGS}" = "${build_rustflags}" ]
-)