diff --git a/test/test_build_package.py b/test/test_build_package.py
index 47f91d82..7277a888 100644
--- a/test/test_build_package.py
+++ b/test/test_build_package.py
@@ -385,8 +385,8 @@ def test_build_local_source_high_level(args, tmpdir):
     aports = tmpdir + "/aports"
     aport = aports + "/device/testing/device-" + args.device
     os.makedirs(aport)
-    shutil.copy(args.aports + "/device/testing/device-" + args.device + "/deviceinfo",
-                aport)
+    path_original = pmb.helpers.pmaports.find(args, f"device-{args.device}")
+    shutil.copy(f"{path_original}/deviceinfo", aport)
 
     # aports: Add modified hello-world aport (source="", uses $builddir)
     aport = aports + "/main/hello-world"
diff --git a/test/test_pkgrel_bump.py b/test/test_pkgrel_bump.py
index e965a4b2..ebceb28e 100644
--- a/test/test_pkgrel_bump.py
+++ b/test/test_pkgrel_bump.py
@@ -80,8 +80,9 @@ def setup_work(args, tmpdir):
     for folder in ["device/testing", "main"]:
         pmb.helpers.run.user(args, ["mkdir", "-p", args.aports, tmpdir +
                                     "/_aports/" + folder])
-    pmb.helpers.run.user(args, ["cp", "-r", args.aports + "/device/testing/device-" +
-                                args.device, tmpdir + "/_aports/device/testing"])
+    path_original = pmb.helpers.pmaports.find(args, f"device-{args.device}")
+    pmb.helpers.run.user(args, ["cp", "-r", path_original,
+                                f"{tmpdir}/_aports/device/testing"])
     for pkgname in ["testlib", "testapp", "testsubpkg"]:
         pmb.helpers.run.user(args, ["cp", "-r",
                                     "test/testdata/pkgrel_bump/aports/" + pkgname,