diff --git a/tests/snapshots/nanos_transfer_eip1559/00000.png b/tests/snapshots/nanos_transfer_eip1559/00000.png
index 2994983..8d84cc7 100644
Binary files a/tests/snapshots/nanos_transfer_eip1559/00000.png and b/tests/snapshots/nanos_transfer_eip1559/00000.png differ
diff --git a/tests/snapshots/nanos_transfer_eip1559/00001.png b/tests/snapshots/nanos_transfer_eip1559/00001.png
index 0bf93d8..9f26513 100644
Binary files a/tests/snapshots/nanos_transfer_eip1559/00001.png and b/tests/snapshots/nanos_transfer_eip1559/00001.png differ
diff --git a/tests/snapshots/nanos_transfer_eip1559/00002.png b/tests/snapshots/nanos_transfer_eip1559/00002.png
index 54bb773..701b26b 100644
Binary files a/tests/snapshots/nanos_transfer_eip1559/00002.png and b/tests/snapshots/nanos_transfer_eip1559/00002.png differ
diff --git a/tests/snapshots/nanos_transfer_eip1559/00003.png b/tests/snapshots/nanos_transfer_eip1559/00003.png
index 21eac94..32a2ee9 100644
Binary files a/tests/snapshots/nanos_transfer_eip1559/00003.png and b/tests/snapshots/nanos_transfer_eip1559/00003.png differ
diff --git a/tests/snapshots/nanos_transfer_eip1559/00004.png b/tests/snapshots/nanos_transfer_eip1559/00004.png
index 4baa24f..1ed3d77 100644
Binary files a/tests/snapshots/nanos_transfer_eip1559/00004.png and b/tests/snapshots/nanos_transfer_eip1559/00004.png differ
diff --git a/tests/snapshots/nanos_transfer_eip1559/00005.png b/tests/snapshots/nanos_transfer_eip1559/00005.png
index 5512e8a..f19d91c 100644
Binary files a/tests/snapshots/nanos_transfer_eip1559/00005.png and b/tests/snapshots/nanos_transfer_eip1559/00005.png differ
diff --git a/tests/snapshots/nanos_transfer_eip1559/00006.png b/tests/snapshots/nanos_transfer_eip1559/00006.png
index 3158ea6..1c9156c 100644
Binary files a/tests/snapshots/nanos_transfer_eip1559/00006.png and b/tests/snapshots/nanos_transfer_eip1559/00006.png differ
diff --git a/tests/snapshots/nanos_transfer_eip1559/00007.png b/tests/snapshots/nanos_transfer_eip1559/00007.png
index 0bef4f3..9c7e704 100644
Binary files a/tests/snapshots/nanos_transfer_eip1559/00007.png and b/tests/snapshots/nanos_transfer_eip1559/00007.png differ
diff --git a/tests/snapshots/nanox_transfer_eip1559/00000.png b/tests/snapshots/nanox_transfer_eip1559/00000.png
index 4a982c5..487ea10 100644
Binary files a/tests/snapshots/nanox_transfer_eip1559/00000.png and b/tests/snapshots/nanox_transfer_eip1559/00000.png differ
diff --git a/tests/snapshots/nanox_transfer_eip1559/00001.png b/tests/snapshots/nanox_transfer_eip1559/00001.png
index be296ea..25b43cc 100644
Binary files a/tests/snapshots/nanox_transfer_eip1559/00001.png and b/tests/snapshots/nanox_transfer_eip1559/00001.png differ
diff --git a/tests/snapshots/nanox_transfer_eip1559/00002.png b/tests/snapshots/nanox_transfer_eip1559/00002.png
index db02d0d..0616792 100644
Binary files a/tests/snapshots/nanox_transfer_eip1559/00002.png and b/tests/snapshots/nanox_transfer_eip1559/00002.png differ
diff --git a/tests/snapshots/nanox_transfer_eip1559/00003.png b/tests/snapshots/nanox_transfer_eip1559/00003.png
index de628de..e483bc5 100644
Binary files a/tests/snapshots/nanox_transfer_eip1559/00003.png and b/tests/snapshots/nanox_transfer_eip1559/00003.png differ
diff --git a/tests/snapshots/nanox_transfer_eip1559/00004.png b/tests/snapshots/nanox_transfer_eip1559/00004.png
index a2cb8f9..570ce28 100644
Binary files a/tests/snapshots/nanox_transfer_eip1559/00004.png and b/tests/snapshots/nanox_transfer_eip1559/00004.png differ
diff --git a/tests/snapshots/nanox_transfer_eip1559/00005.png b/tests/snapshots/nanox_transfer_eip1559/00005.png
index 7a77cb1..c922246 100644
Binary files a/tests/snapshots/nanox_transfer_eip1559/00005.png and b/tests/snapshots/nanox_transfer_eip1559/00005.png differ
diff --git a/tests/src/eip1559.test.js b/tests/src/eip1559.test.js
index 37c8037..2537c82 100644
--- a/tests/src/eip1559.test.js
+++ b/tests/src/eip1559.test.js
@@ -1,39 +1,30 @@
 import "core-js/stable";
 import "regenerator-runtime/runtime";
-import { waitForAppScreen, zemu } from './test.fixture';
+import { waitForAppScreen, zemu, nano_models } from './test.fixture';
 
-test('[Nano S] Transfer eip1559', zemu("nanos", async (sim, eth) => {
+nano_models.forEach(function(model) {
+    test('[Nano ' + model.letter + '] Transfer eip1559', zemu(model, async (sim, eth) => {
 
-  const tx = eth.signTransaction(
-    "44'/60'/0'/0/0",
-    '02f87001018502540be4008502540be40086246139ca800094cccccccccccccccccccccccccccccccccccccccc8000c001a0e07fb8a64ea3786c9a6649e54429e2786af3ea31c6d06165346678cf8ce44f9ba00e4a0526db1e905b7164a858fd5ebd2f1759e22e6955499448bd276a6aa62830',
-  );
+      const tx = eth.signTransaction(
+        "44'/60'/0'/0/0",
+        '02f87001018502540be4008502540be40086246139ca800094cccccccccccccccccccccccccccccccccccccccc8000c001a0e07fb8a64ea3786c9a6649e54429e2786af3ea31c6d06165346678cf8ce44f9ba00e4a0526db1e905b7164a858fd5ebd2f1759e22e6955499448bd276a6aa62830',
+      );
 
-  await waitForAppScreen(sim);
-  await sim.navigateAndCompareSnapshots('.', 'nanos_transfer_eip1559', [6, 0]);
+      await waitForAppScreen(sim);
+      let clicks;
+      if (model.letter === 'S') clicks = [7];
+      else clicks = [5];
+      // Go to the reject screen
+      await sim.navigateAndCompareSnapshots('.', model.name + '_transfer_eip1559', clicks);
+      // Accepting the transaction somehow takes too long for Zemu and takes the same screenshot
+      // twice, so accept it manually
+      await sim.clickLeft();
+      await sim.clickBoth();
 
-  await expect(tx).resolves.toEqual({
-    "r": "3d6dfabc6c52374bfa34cb2c433856a0bcd9484870dd1b50249f7164a5fce052",
-    "s": "0548a774dd0b63930d83cb2e1a836fe3ef24444e8b758b00585d9a076c0e98a8",
-    "v": "01"
-  });
-
-}));
-
-test.skip('[Nano X] Transfer eip1559', zemu("nanox", async (sim, eth) => {
-
-  const tx = eth.signTransaction(
-    "44'/60'/0'/0/0",
-    '02f87001018502540be4008502540be40086246139ca800094cccccccccccccccccccccccccccccccccccccccc8000c001a0e07fb8a64ea3786c9a6649e54429e2786af3ea31c6d06165346678cf8ce44f9ba00e4a0526db1e905b7164a858fd5ebd2f1759e22e6955499448bd276a6aa62830',
-  );
-
-  await waitForAppScreen(sim);
-  await sim.navigateAndCompareSnapshots('.', 'nanox_transfer_eip1559', [4, 0]);
-
-  await expect(tx).resolves.toEqual({
-    "r": "3d6dfabc6c52374bfa34cb2c433856a0bcd9484870dd1b50249f7164a5fce052",
-    "s": "0548a774dd0b63930d83cb2e1a836fe3ef24444e8b758b00585d9a076c0e98a8",
-    "v": "01"
-  });
-
-}));
+      await expect(tx).resolves.toEqual({
+        "r": "3d6dfabc6c52374bfa34cb2c433856a0bcd9484870dd1b50249f7164a5fce052",
+        "s": "0548a774dd0b63930d83cb2e1a836fe3ef24444e8b758b00585d9a076c0e98a8",
+        "v": "01"
+      });
+    }));
+});