diff --git a/test/src/com/xilinx/rapidwright/interchange/TestCellBELMappings.java b/test/src/com/xilinx/rapidwright/interchange/TestCellBELMappings.java
index 3cec807be..7af7d46a6 100644
--- a/test/src/com/xilinx/rapidwright/interchange/TestCellBELMappings.java
+++ b/test/src/com/xilinx/rapidwright/interchange/TestCellBELMappings.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, Xilinx, Inc.
- * Copyright (c) 2022-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2022-2024, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Author: Chris Lavin, Xilinx Research Labs.
@@ -23,22 +23,23 @@
 
 package com.xilinx.rapidwright.interchange;
 
-import org.capnproto.MessageBuilder;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import com.xilinx.rapidwright.device.Device;
 import com.xilinx.rapidwright.interchange.DeviceResources.Device.CellBelMapping;
 import com.xilinx.rapidwright.interchange.DeviceResources.Device.CellBelPinEntry;
 import com.xilinx.rapidwright.interchange.DeviceResources.Device.ParameterCellBelPinMaps;
+import org.capnproto.MessageBuilder;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 public class TestCellBELMappings {
 
-    @Test
-    public void testCellBELPinMappings() {
+    @ParameterizedTest
+    @ValueSource(strings = {"xc7a15t"})
+    public void testCellBELPinMappings(String deviceName) {
         StringEnumerator allStrings = new StringEnumerator();
         MessageBuilder message = new MessageBuilder();
-        Device device = Device.getDevice(TestDeviceResources.TEST_DEVICE);
+        Device device = Device.getDevice(deviceName);
         DeviceResources.Device.Builder devBuilder = message.initRoot(DeviceResources.Device.factory);
         EnumerateCellBelMapping.populateAllPinMappings(device.getName(), device, devBuilder, allStrings);
 
diff --git a/test/src/com/xilinx/rapidwright/interchange/TestDeviceResources.java b/test/src/com/xilinx/rapidwright/interchange/TestDeviceResources.java
index 805ab3795..47cf7daac 100644
--- a/test/src/com/xilinx/rapidwright/interchange/TestDeviceResources.java
+++ b/test/src/com/xilinx/rapidwright/interchange/TestDeviceResources.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, Xilinx, Inc.
- * Copyright (c) 2022, Advanced Micro Devices, Inc.
+ * Copyright (c) 2022, 2024, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Author: Chris Lavin, Xilinx Research Labs.
@@ -23,27 +23,30 @@
 
 package com.xilinx.rapidwright.interchange;
 
-import java.io.IOException;
-import java.nio.file.Path;
-
+import com.xilinx.rapidwright.device.Device;
+import com.xilinx.rapidwright.device.Node;
+import com.xilinx.rapidwright.device.Wire;
+import com.xilinx.rapidwright.tests.CodePerfTracker;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
-import com.xilinx.rapidwright.device.Device;
-import com.xilinx.rapidwright.tests.CodePerfTracker;
+import java.io.IOException;
+import java.nio.file.Path;
 
 public class TestDeviceResources {
 
-    public static final String TEST_DEVICE = "xc7a15t";
-
-    @Test
-    public void testDeviceResources(@TempDir Path tempDir) throws IOException {
-        Path capnProtoFile = tempDir.resolve(TEST_DEVICE + ".device");
-        Device device = Device.getDevice(TEST_DEVICE);
+    @ParameterizedTest
+    @ValueSource(strings = {"xcau10p", "xc7a15t"})
+    public void testDeviceResources(String deviceName, @TempDir Path tempDir) throws IOException {
+        Path capnProtoFile = tempDir.resolve(deviceName + ".device");
+        Device device = Device.getDevice(deviceName);
         DeviceResourcesWriter.writeDeviceResourcesFile(
-                TEST_DEVICE, device, CodePerfTracker.SILENT, capnProtoFile.toString());
+                deviceName, device, CodePerfTracker.SILENT, capnProtoFile.toString());
         Device.releaseDeviceReferences();
-        DeviceResourcesVerifier.verifyDeviceResources(capnProtoFile.toString(), TEST_DEVICE);
+        DeviceResourcesVerifier.verifyDeviceResources(capnProtoFile.toString(), deviceName);
     }