diff --git a/.github/dockerfiles/Dockerfile.feeds b/.github/dockerfiles/Dockerfile.feeds
new file mode 100644
index 00000000..a76220ef
--- /dev/null
+++ b/.github/dockerfiles/Dockerfile.feeds
@@ -0,0 +1,7 @@
+ARG ARCH=x86-64
+FROM openwrt/rootfs:$ARCH
+
+ADD scripts/ci_helpers.sh /scripts/ci_helpers.sh
+ADD scripts/test_entrypoint.sh /scripts/test_entrypoint.sh
+
+CMD ["/scripts/test_entrypoint.sh"]
diff --git a/.github/dockerfiles_feeds/Dockerfile b/.github/dockerfiles_feeds/Dockerfile
deleted file mode 100644
index fbd17fc1..00000000
--- a/.github/dockerfiles_feeds/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-ARG ARCH=x86-64
-FROM openwrt/rootfs:$ARCH
-
-ADD entrypoint.sh /entrypoint.sh
-
-CMD ["/entrypoint.sh"]
diff --git a/.github/dockerfiles_feeds/entrypoint.sh b/.github/dockerfiles_feeds/entrypoint.sh
deleted file mode 100755
index 7a6103fb..00000000
--- a/.github/dockerfiles_feeds/entrypoint.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# not enabling `errtrace` and `pipefail` since those are bash specific
-set -o errexit # failing commands causes script to fail
-set -o nounset # undefined variables causes script to fail
-
-mkdir -p /var/lock/
-mkdir -p /var/log/
-
-if [ $PKG_MANAGER = "opkg" ]; then
-	echo "src/gz packages_ci file:///ci" >> /etc/opkg/distfeeds.conf
-	# Disable checking signature for all opkg feeds, since it doesn't look like
-	# it's possible to do it for the local feed only, which has signing removed.
-	# This fixes running CI tests.
-	sed -i '/check_signature/d' /etc/opkg.conf
-	opkg update
-elif [ $PKG_MANAGER = "apk" ]; then
-	echo "/ci/packages.adb" >> /etc/apk/repositories.d/distfeeds.list
-	apk update
-fi
-
-CI_HELPER="${CI_HELPER:-/ci/.github/workflows/ci_helpers.sh}"
-
-for PKG in /ci/*.[ai]pk; do
-	if [ $PKG_MANAGER = "opkg" ]; then
-		tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control
-		# package name including variant
-		PKG_NAME=$(sed -ne 's#^Package: \(.*\)$#\1#p' ./control)
-		# package version without release
-		PKG_VERSION=$(sed -ne 's#^Version: \(.*\)$#\1#p' ./control)
-		PKG_VERSION="${PKG_VERSION%-[!-]*}"
-		# package source containing test.sh script
-		PKG_SOURCE=$(sed -ne 's#^Source: \(.*\)$#\1#p' ./control)
-		PKG_SOURCE="${PKG_SOURCE#/feed/}"
-	elif [ $PKG_MANAGER = "apk" ]; then
-		# package name including variant
-		PKG_NAME=$(apk adbdump --format json "$PKG" | jsonfilter -e '@["info"]["name"]')
-		# package version without release
-		PKG_VERSION=$(apk adbdump --format json "$PKG" | jsonfilter -e '@["info"]["version"]')
-		PKG_VERSION="${PKG_VERSION%-[!-]*}"
-		# package source containing test.sh script
-		PKG_SOURCE=$(apk adbdump --format json "$PKG" | jsonfilter -e '@["info"]["origin"]')
-		PKG_SOURCE="${PKG_SOURCE#/feed/}"
-	fi
-
-	echo
-	echo "Testing package $PKG_NAME in version $PKG_VERSION from $PKG_SOURCE"
-
-	if ! [ -d "/ci/$PKG_SOURCE" ]; then
-		echo "$PKG_SOURCE is not a directory"
-		exit 1
-	fi
-
-	PRE_TEST_SCRIPT="/ci/$PKG_SOURCE/pre-test.sh"
-	TEST_SCRIPT="/ci/$PKG_SOURCE/test.sh"
-
-	if ! [ -f "$TEST_SCRIPT" ]; then
-		echo "No test.sh script available"
-		continue
-	fi
-
-	export PKG_NAME PKG_VERSION CI_HELPER
-
-	if [ -f "$PRE_TEST_SCRIPT" ]; then
-		echo "Use package specific pre-test.sh"
-		if sh "$PRE_TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
-			echo "Pre-test successful"
-		else
-			echo "Pre-test failed"
-			exit 1
-		fi
-	else
-		echo "No pre-test.sh script available"
-	fi
-
-	if [ $PKG_MANAGER = "opkg" ]; then
-		opkg install "$PKG"
-	elif [ $PKG_MANAGER = "apk" ]; then
-		apk add --allow-untrusted "$PKG"
-	fi
-
-	echo "Use package specific test.sh"
-	if sh "$TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
-		echo "Test successful"
-	else
-		echo "Test failed"
-		exit 1
-	fi
-
-	if [ $PKG_MANAGER = "opkg" ]; then
-		opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove --autoremove || true
-	elif [ $PKG_MANAGER = "apk" ]; then
-		apk del -r "$PKG_NAME"
-	fi
-done
diff --git a/.github/scripts/test_entrypoint.sh b/.github/scripts/test_entrypoint.sh
new file mode 100755
index 00000000..e0313099
--- /dev/null
+++ b/.github/scripts/test_entrypoint.sh
@@ -0,0 +1,301 @@
+#!/bin/sh
+
+# not enabling `errtrace` and `pipefail` since those are bash specific
+set -o errexit # failing commands causes script to fail
+set -o nounset # undefined variables causes script to fail
+
+mkdir -p /var/lock/
+mkdir -p /var/log/
+
+CI_HELPERS="${CI_HELPERS:-/scripts/ci_helpers.sh}"
+
+source "$CI_HELPERS"
+
+generic_tests_enabled() {
+	[ "$ENABLE_GENERIC_TESTS" = 'true' ]
+}
+
+generic_tests_forced() {
+	[ "$FORCE_GENERIC_TESTS" = 'true' ]
+}
+
+is_exec() {
+	[ -x "$1" ] && echo "$1" | grep -qE '^(/bin/|/sbin/|/usr/bin/|/usr/sbin/|/usr/libexec/)'
+}
+
+is_lib() {
+	echo "$1" | grep -qE '^(/lib/|/usr/lib/)'
+}
+
+is_apk() {
+	[ "$PKG_MANAGER" = 'apk' ]
+}
+
+is_opkg() {
+	[ "$PKG_MANAGER" = 'opkg' ]
+}
+
+check_hardcoded_paths() {
+	local file="$1"
+
+	if strings "$file" | grep -E '/build_dir/'; then
+		status_warn "Binary $file contains a hardcoded build path"
+		return 1
+	fi
+
+	status_pass "Binary $file does not contain any hardcoded build paths"
+	return 0
+}
+
+check_exec() {
+	local file="$1"
+	local has_failure=0
+
+	if [ -x "$file" ]; then
+		status_pass "File $file is executable"
+	else
+		status_fail "File $file in executable path is not executable"
+		has_failure=1
+	fi
+
+	local found_version=0
+	for flag in --version -version version -v -V --help -help -?; do
+		if "$file" "$flag" 2>&1 | grep -F "$PKG_VERSION"; then
+			status_pass "Found version $PKG_VERSION in $file"
+			found_version=1
+			break
+		fi
+	done
+
+	if [ "$found_version" = 0 ]; then
+		status_fail "Failed to find version $PKG_VERSION in $file"
+		has_failure=1
+	fi
+
+	if [ "$has_failure" = 1 ]; then
+		return 1
+	fi
+
+	return 0
+}
+
+check_linked_libs() {
+	local file="$1"
+	local missing_libs
+	missing_libs=$(ldd "$file" 2>/dev/null | grep "not found" || true)
+	if [ -n "$missing_libs" ]; then
+		status_fail "File $file has missing libraries:"
+		echo "$missing_libs"
+		return 1
+	fi
+
+	status_pass "All linked libraries for $file are present"
+	return 0
+}
+
+check_lib()	{
+	local file="$1"
+	local has_failure=0
+	local soname
+	soname=$(readelf -d "$file" 2>/dev/null | grep 'SONAME' | sed -E 's/.*\[(.*)\].*/\1/')
+	if [ -n "$soname" ]; then
+		if [ "$(basename "$file")" = "$soname" ]; then
+			status_warn "Library $file has the same name as its SONAME '$soname'. The library file should have a more specific version."
+		else
+			status_pass "Library $file has SONAME '$soname'"
+		fi
+
+		# When a library has a SONAME, there should be a symlink with the SONAME
+		# pointing to the library file. This is usually in the same directory.
+		local lib_dir
+		lib_dir=$(dirname "$file")
+		if [ ! -L "$lib_dir/$soname" ]; then
+			status_fail "Library $file has SONAME '$soname' but no corresponding symlink was found in $lib_dir"
+			has_failure=1
+		elif [ "$(readlink -f "$lib_dir/$soname")" != "$(readlink -f "$file")" ]; then
+			status_fail "Symlink for SONAME '$soname' does not point to $file"
+			has_failure=1
+		else
+			status_pass "SONAME link for $file is correct"
+		fi
+	else
+		status_warn "Library $file doesn't have a SONAME"
+	fi
+
+	if [ "$has_failure" = 1 ]; then
+		return 1
+	fi
+
+	return 0
+}
+
+do_generic_tests() {
+	local all_files
+	if is_opkg; then
+		all_files=$(opkg files "$PKG_NAME")
+	elif is_apk; then
+		all_files=$(apk info --contents "$PKG_NAME" | sed 's#^#/#')
+	fi
+
+	local files
+	files=$(echo "$all_files" | grep -E '^(/bin/|/sbin/|/usr/bin/|/usr/libexec/|/usr/sbin/|/lib/|/usr/lib/)')
+
+	local has_failure=0
+	for file in $files; do
+		if [ ! -e "$file" ]; then
+			# opkg files can list directories
+			continue
+		fi
+
+		# Check if it is a symlink and if the target exists
+		if [ -L "$file" ]; then
+			if [ -e "$(readlink -f "$file")" ]; then
+				status_pass "Symlink $file points to an existing file"
+			else
+				status_fail "Symlink $file points to a non-existent file"
+				has_failure=1
+			fi
+
+			# Skip symlinks
+			continue
+		fi
+
+		if is_exec "$file" && ! check_exec "$file"; then
+			has_failure=1
+		fi
+
+		# Skip non-ELF files
+		if ! file "$file" | grep -q "ELF"; then
+			continue
+		fi
+
+		check_hardcoded_paths "$file"
+
+		if file "$file" | grep 'not stripped'; then
+			status_warn "Binary $file is not stripped"
+		else
+			status_pass "Binary $file is stripped"
+		fi
+
+		if ! check_linked_libs "$file"; then
+			has_failure=1
+		fi
+
+		if is_lib "$file" && ! check_lib "$file"; then
+			has_failure=1
+		fi
+	done
+
+	if [ "$has_failure" = 1 ]; then
+		err "Generic tests failed"
+		return 1
+	fi
+
+	success "Generic tests passed"
+	return 0
+}
+
+if is_opkg; then
+	echo "src/gz packages_ci file:///ci" >> /etc/opkg/distfeeds.conf
+	# Disable checking signature for all opkg feeds, since it doesn't look like
+	# it's possible to do it for the local feed only, which has signing removed.
+	# This fixes running CI tests.
+	sed -i '/check_signature/d' /etc/opkg.conf
+	opkg update
+	opkg install binutils file
+elif is_apk; then
+	echo "/ci/packages.adb" >> /etc/apk/repositories.d/distfeeds.list
+	apk update
+	apk add binutils file
+fi
+
+if generic_tests_enabled && generic_tests_forced; then
+	warn 'Generic tests are enabled and forced'
+elif generic_tests_enabled; then
+	warn 'Generic tests are enabled'
+else
+	warn 'Generic tests are disabled'
+fi
+
+for PKG in /ci/*.[ai]pk; do
+	if is_opkg; then
+		tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control
+		# package name including variant
+		PKG_NAME=$(sed -ne 's#^Package: \(.*\)$#\1#p' ./control)
+		# package version without release
+		PKG_VERSION=$(sed -ne 's#^Version: \(.*\)$#\1#p' ./control)
+		PKG_VERSION="${PKG_VERSION%-[!-]*}"
+		# package source containing test.sh script
+		PKG_SOURCE=$(sed -ne 's#^Source: \(.*\)$#\1#p' ./control)
+		PKG_SOURCE="${PKG_SOURCE#/feed/}"
+	elif is_apk; then
+		# package name including variant
+		PKG_NAME=$(apk adbdump --format json "$PKG" | jsonfilter -e '@["info"]["name"]')
+		# package version without release
+		PKG_VERSION=$(apk adbdump --format json "$PKG" | jsonfilter -e '@["info"]["version"]')
+		PKG_VERSION="${PKG_VERSION%-[!-]*}"
+		# package source containing test.sh script
+		PKG_SOURCE=$(apk adbdump --format json "$PKG" | jsonfilter -e '@["info"]["origin"]')
+		PKG_SOURCE="${PKG_SOURCE#/feed/}"
+	fi
+
+	echo
+	info "Testing package version $PKG_VERSION from $PKG_SOURCE"
+
+	if ! [ -d "/ci/$PKG_SOURCE" ]; then
+		err_die "$PKG_SOURCE is not a directory"
+	fi
+
+	PRE_TEST_SCRIPT="/ci/$PKG_SOURCE/pre-test.sh"
+	TEST_SCRIPT="/ci/$PKG_SOURCE/test.sh"
+
+	export PKG_NAME PKG_VERSION CI_HELPERS
+
+	if [ -f "$PRE_TEST_SCRIPT" ]; then
+		info 'Use the package-specific pre-test.sh'
+		if sh "$PRE_TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
+			success 'Pre-test passed'
+		else
+			err_die 'Pre-test failed'
+		fi
+	else
+		info 'No pre-test.sh script available'
+	fi
+
+	if is_opkg; then
+		opkg install "$PKG"
+	elif is_apk; then
+		apk add --allow-untrusted "$PKG"
+	fi
+
+	SUCCESS=0
+
+	if generic_tests_enabled && ( generic_tests_forced || [ ! -f "$TEST_SCRIPT" ] ); then
+		warn 'Use generic tests'
+		if do_generic_tests; then
+			SUCCESS=1
+		fi
+	fi
+
+	if [ -f "$TEST_SCRIPT" ]; then
+		info 'Use the package-specific test.sh'
+		if sh "$TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
+			success 'Test passed'
+			SUCCESS=1
+		else
+			err 'Test failed'
+		fi
+	fi
+
+	if is_opkg; then
+		opkg remove "$PKG_NAME" \
+				--autoremove \
+				--force-removal-of-dependent-packages \
+				--force-remove \
+			|| true
+	elif is_apk; then
+		apk del --rdepends "$PKG_NAME" || true
+	fi
+
+	[ "$SUCCESS" = 1 ] || exit 1
+done
diff --git a/.github/workflows/multi-arch-test-build.yml b/.github/workflows/multi-arch-test-build.yml
index ec5ef8ea..ac3c58c1 100644
--- a/.github/workflows/multi-arch-test-build.yml
+++ b/.github/workflows/multi-arch-test-build.yml
@@ -2,6 +2,13 @@ name: Feeds Package Test Build
 
 on:
   workflow_call:
+    inputs:
+      enable_generic_tests:
+        type: boolean
+        default: true
+      force_generic_tests:
+        type: boolean
+        default: true
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -213,31 +220,38 @@ jobs:
           sudo apt-get install -y qemu-user-static binfmt-support
           sudo update-binfmts --import
 
-      - name: Checkout
+      - name: Checkout test scripts
         if: ${{ matrix.runtime_test && fromJSON(env.HAVE_PKGS) }}
         uses: actions/checkout@v6
         with:
           repository: openwrt/actions-shared-workflows
-          path: dockerfiles_feeds
+          path: workflow_context
           sparse-checkout: |
             .github/scripts/ci_helpers.sh
-            .github/dockerfiles_feeds/Dockerfile
-            .github/dockerfiles_feeds/entrypoint.sh
+            .github/dockerfiles/Dockerfile.feeds
+            .github/scripts/test_entrypoint.sh
           sparse-checkout-cone-mode: false
 
       - name: Build Docker container
         if: ${{ matrix.runtime_test && fromJSON(env.HAVE_PKGS) }}
         run: |
-          docker build --platform linux/${{ matrix.arch }} -t test-container \
-            --build-arg ARCH dockerfiles_feeds/.github/dockerfiles_feeds/
+          docker build \
+            --build-arg ARCH \
+            --file workflow_context/.github/dockerfiles/Dockerfile.feeds \
+            --platform linux/${{ matrix.arch }} \
+            --tag test-container \
+            workflow_context/.github
         env:
           ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
 
       - name: Test via Docker container
         if: ${{ matrix.runtime_test && fromJSON(env.HAVE_PKGS) }}
         run: |
-          docker run --platform linux/${{ matrix.arch }} --rm -v $GITHUB_WORKSPACE:/ci \
-            -v $GITHUB_WORKSPACE/dockerfiles_feeds:/dockerfiles_feeds \
-            -e CI_HELPER=/dockerfiles_feeds/scripts/ci_helpers.sh \
+          docker run \
+            -e ENABLE_GENERIC_TESTS=${{ inputs.enable_generic_tests }} \
+            -e FORCE_GENERIC_TESTS=${{ inputs.force_generic_tests }} \
             -e PKG_MANAGER=${{ env.PKG_MANAGER }} \
+            --platform linux/${{ matrix.arch }} \
+            --rm \
+            --volume $GITHUB_WORKSPACE:/ci \
             test-container