diff --git a/src/com/xilinx/rapidwright/edif/EDIFNetlist.java b/src/com/xilinx/rapidwright/edif/EDIFNetlist.java
index 601f0f3dc..d39899d12 100644
--- a/src/com/xilinx/rapidwright/edif/EDIFNetlist.java
+++ b/src/com/xilinx/rapidwright/edif/EDIFNetlist.java
@@ -802,14 +802,7 @@ public void exportEDIF(OutputStream out, boolean stable) throws IOException {
             }
             os.write(EXPORT_CONST_DOUBLE_CLOSE);
 
-            List<EDIFLibrary> librariesToWrite = new ArrayList<>();
-            librariesToWrite.add(getHDIPrimitivesLibrary());
-            for (EDIFLibrary lib : EDIFTools.sortIfStable(getLibrariesMap().values(), stable)) {
-                if (lib.isHDIPrimitivesLibrary()) {
-                    continue;
-                }
-                librariesToWrite.add(lib);
-            }
+            List<EDIFLibrary> librariesToWrite = getLibrariesInExportOrder();
 
             if (dos != null) {
                 Deque<Future<ParallelDCPInput>> streamFutures = new ArrayDeque<>();
diff --git a/test/src/com/xilinx/rapidwright/edif/TestEDIFNetlist.java b/test/src/com/xilinx/rapidwright/edif/TestEDIFNetlist.java
index c4e716958..2f9ccaa32 100644
--- a/test/src/com/xilinx/rapidwright/edif/TestEDIFNetlist.java
+++ b/test/src/com/xilinx/rapidwright/edif/TestEDIFNetlist.java
@@ -417,8 +417,10 @@ public void testBussedPortNamingCollision(@TempDir Path path) {
 
         EDIFCell top = origNetlist.getTopCell();
 
-        EDIFCellInst ff = top.createChildCellInst("ff", Design.getPrimitivesLibrary().getCell("FDRE"));
-        origNetlist.getHDIPrimitivesLibrary().addCell(ff.getCellType());
+        EDIFCell fdre = new EDIFCell(Design.getUnisimCell(Unisim.FDRE));
+        EDIFLibrary hdi = origNetlist.getHDIPrimitivesLibrary();
+        hdi.addCell(fdre);
+        EDIFCellInst ff = top.createChildCellInst("ff", fdre);
 
         String portName = "unfortunate_name";
 
@@ -456,8 +458,10 @@ public void testBussedPortReNamingCollision(@TempDir Path path) {
 
         EDIFCell top = origNetlist.getTopCell();
 
-        EDIFCellInst ff = top.createChildCellInst("ff", Design.getPrimitivesLibrary().getCell("FDRE"));
-        origNetlist.getHDIPrimitivesLibrary().addCell(ff.getCellType());
+        EDIFCell fdre = new EDIFCell(Design.getUnisimCell(Unisim.FDRE));
+        EDIFLibrary hdi = origNetlist.getHDIPrimitivesLibrary();
+        hdi.addCell(fdre);
+        EDIFCellInst ff = top.createChildCellInst("ff", fdre);
 
         String portName = "unfortunate_name";