diff --git a/device/testing/device-huawei-g7/APKBUILD b/device/testing/device-huawei-g7/APKBUILD
index 00e20128e..75489ce41 100644
--- a/device/testing/device-huawei-g7/APKBUILD
+++ b/device/testing/device-huawei-g7/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-huawei-g7
 pkgdesc="Huawei Ascend G7"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,7 +24,10 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom firmware-qcom-msm8916-wcnss firmware-huawei-g7-wcnss-nv"
+	# msm-firmware-loader not needed because modem is not supported yet
+	depends="firmware-qcom-adreno-a300
+		 firmware-qcom-msm8916-wcnss firmware-huawei-g7-wcnss-nv
+		 firmware-qcom-msm8916-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-oppo-a51f/APKBUILD b/device/testing/device-oppo-a51f/APKBUILD
index 575775383..b00822f79 100644
--- a/device/testing/device-oppo-a51f/APKBUILD
+++ b/device/testing/device-oppo-a51f/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oppo-a51f
 pkgdesc="OPPO Mirror 5s"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -22,7 +22,10 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom firmware-qcom-msm8916-wcnss firmware-oppo-a51f-wcnss-nv"
+	# msm-firmware-loader not needed because modem is not supported yet
+	depends="firmware-qcom-adreno-a300
+		 firmware-qcom-msm8916-wcnss firmware-oppo-a51f-wcnss-nv
+		 firmware-qcom-msm8916-venus"
 	mkdir "$subpkgdir"
 }