diff --git a/tests/snapshots/nanos_approve_dai_tokens/00000.png b/tests/snapshots/nanos_approve_dai_tokens/00000.png
index 2994983..8d84cc7 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00000.png and b/tests/snapshots/nanos_approve_dai_tokens/00000.png differ
diff --git a/tests/snapshots/nanos_approve_dai_tokens/00001.png b/tests/snapshots/nanos_approve_dai_tokens/00001.png
index c56730d..e48314b 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00001.png and b/tests/snapshots/nanos_approve_dai_tokens/00001.png differ
diff --git a/tests/snapshots/nanos_approve_dai_tokens/00002.png b/tests/snapshots/nanos_approve_dai_tokens/00002.png
index 4e39c00..d514de0 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00002.png and b/tests/snapshots/nanos_approve_dai_tokens/00002.png differ
diff --git a/tests/snapshots/nanos_approve_dai_tokens/00003.png b/tests/snapshots/nanos_approve_dai_tokens/00003.png
index 7148c92..95968f9 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00003.png and b/tests/snapshots/nanos_approve_dai_tokens/00003.png differ
diff --git a/tests/snapshots/nanos_approve_dai_tokens/00004.png b/tests/snapshots/nanos_approve_dai_tokens/00004.png
index ee9bfd0..f5c1c9b 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00004.png and b/tests/snapshots/nanos_approve_dai_tokens/00004.png differ
diff --git a/tests/snapshots/nanos_approve_dai_tokens/00005.png b/tests/snapshots/nanos_approve_dai_tokens/00005.png
index cfe7258..839e83a 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00005.png and b/tests/snapshots/nanos_approve_dai_tokens/00005.png differ
diff --git a/tests/snapshots/nanos_approve_dai_tokens/00006.png b/tests/snapshots/nanos_approve_dai_tokens/00006.png
index b59840a..aca9efb 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00006.png and b/tests/snapshots/nanos_approve_dai_tokens/00006.png differ
diff --git a/tests/snapshots/nanos_approve_dai_tokens/00007.png b/tests/snapshots/nanos_approve_dai_tokens/00007.png
index 3158ea6..1c9156c 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00007.png and b/tests/snapshots/nanos_approve_dai_tokens/00007.png differ
diff --git a/tests/snapshots/nanos_approve_dai_tokens/00008.png b/tests/snapshots/nanos_approve_dai_tokens/00008.png
index 0bef4f3..9c7e704 100644
Binary files a/tests/snapshots/nanos_approve_dai_tokens/00008.png and b/tests/snapshots/nanos_approve_dai_tokens/00008.png differ
diff --git a/tests/snapshots/nanox_approve_dai_tokens/00000.png b/tests/snapshots/nanox_approve_dai_tokens/00000.png
index 4a982c5..487ea10 100644
Binary files a/tests/snapshots/nanox_approve_dai_tokens/00000.png and b/tests/snapshots/nanox_approve_dai_tokens/00000.png differ
diff --git a/tests/snapshots/nanox_approve_dai_tokens/00001.png b/tests/snapshots/nanox_approve_dai_tokens/00001.png
index c9f6ee0..6816e99 100644
Binary files a/tests/snapshots/nanox_approve_dai_tokens/00001.png and b/tests/snapshots/nanox_approve_dai_tokens/00001.png differ
diff --git a/tests/snapshots/nanox_approve_dai_tokens/00002.png b/tests/snapshots/nanox_approve_dai_tokens/00002.png
index 6207f9e..42cf5e6 100644
Binary files a/tests/snapshots/nanox_approve_dai_tokens/00002.png and b/tests/snapshots/nanox_approve_dai_tokens/00002.png differ
diff --git a/tests/snapshots/nanox_approve_dai_tokens/00003.png b/tests/snapshots/nanox_approve_dai_tokens/00003.png
index 4f601ca..0f60a97 100644
Binary files a/tests/snapshots/nanox_approve_dai_tokens/00003.png and b/tests/snapshots/nanox_approve_dai_tokens/00003.png differ
diff --git a/tests/snapshots/nanox_approve_dai_tokens/00004.png b/tests/snapshots/nanox_approve_dai_tokens/00004.png
index a15d822..008ec31 100644
Binary files a/tests/snapshots/nanox_approve_dai_tokens/00004.png and b/tests/snapshots/nanox_approve_dai_tokens/00004.png differ
diff --git a/tests/snapshots/nanox_approve_dai_tokens/00005.png b/tests/snapshots/nanox_approve_dai_tokens/00005.png
index a2cb8f9..570ce28 100644
Binary files a/tests/snapshots/nanox_approve_dai_tokens/00005.png and b/tests/snapshots/nanox_approve_dai_tokens/00005.png differ
diff --git a/tests/snapshots/nanox_approve_dai_tokens/00006.png b/tests/snapshots/nanox_approve_dai_tokens/00006.png
index 7a77cb1..c922246 100644
Binary files a/tests/snapshots/nanox_approve_dai_tokens/00006.png and b/tests/snapshots/nanox_approve_dai_tokens/00006.png differ
diff --git a/tests/src/approve.test.js b/tests/src/approve.test.js
index 63496f5..b39bab5 100644
--- a/tests/src/approve.test.js
+++ b/tests/src/approve.test.js
@@ -1,37 +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] Approve DAI tokens', zemu("nanos", async (sim, eth) => {
+nano_models.forEach(function(model) {
+    test('[Nano ' + model.letter + '] Approve DAI tokens', zemu(model, async (sim, eth) => {
 
-  const tx = eth.signTransaction(
-    "44'/60'/1'/0/0",
-    'F869468506A8B15E0082EBEB946B175474E89094C44DA98B954EEDEAC495271D0F80B844095EA7B30000000000000000000000007D2768DE32B0B80B7A3454C06BDAC94A69DDC7A9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF018080',
-  );
+      const tx = eth.signTransaction(
+        "44'/60'/1'/0/0",
+        'F869468506A8B15E0082EBEB946B175474E89094C44DA98B954EEDEAC495271D0F80B844095EA7B30000000000000000000000007D2768DE32B0B80B7A3454C06BDAC94A69DDC7A9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF018080',
+      );
 
-  await waitForAppScreen(sim);
-  await sim.navigateAndCompareSnapshots('.', 'nanos_approve_dai_tokens', [7, 0]);
+      let clicks;
+      if (model.letter === 'S') clicks = [8];
+      else clicks = [6];
+      await waitForAppScreen(sim);
+      // Go to the reject screen
+      await sim.navigateAndCompareSnapshots('.', model.name + '_approve_dai_tokens', 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": "92243511396b65a4faa735a5472ea99b3ce0f7f2338eab426206730bc0ddc57f",
-    "s": "161bc0f861064d840de4f4304cfd19a571017e62df7d8f70cf605c0f025593b6",
-    "v": "25",
-  });
-}));
-
-test.skip('[Nano X] Approve DAI tokens', zemu("nanox", async (sim, eth) => {
-
-  const tx = eth.signTransaction(
-    "44'/60'/1'/0/0",
-    'F869468506A8B15E0082EBEB946B175474E89094C44DA98B954EEDEAC495271D0F80B844095EA7B30000000000000000000000007D2768DE32B0B80B7A3454C06BDAC94A69DDC7A9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF018080',
-  );
-
-  await waitForAppScreen(sim);
-  await sim.navigateAndCompareSnapshots('.', 'nanox_approve_dai_tokens', [5, 0]);
-
-  await expect(tx).resolves.toEqual({
-    "r": "92243511396b65a4faa735a5472ea99b3ce0f7f2338eab426206730bc0ddc57f",
-    "s": "161bc0f861064d840de4f4304cfd19a571017e62df7d8f70cf605c0f025593b6",
-    "v": "25",
-  });
-}));
+      await expect(tx).resolves.toEqual({
+        "r": "92243511396b65a4faa735a5472ea99b3ce0f7f2338eab426206730bc0ddc57f",
+        "s": "161bc0f861064d840de4f4304cfd19a571017e62df7d8f70cf605c0f025593b6",
+        "v": "25",
+      });
+    }));
+});