diff --git a/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00000.png b/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00000.png
index e47d648..c2420af 100644
Binary files a/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00000.png and b/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00000.png differ
diff --git a/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00001.png b/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00001.png
index b4443b6..b31e455 100644
Binary files a/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00001.png and b/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00001.png differ
diff --git a/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00002.png b/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00002.png
index 0bef4f3..ce795f3 100644
Binary files a/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00002.png and b/tests/snapshots/nanos_try_to_blind_sign_with_setting_disabled/00002.png differ
diff --git a/tests/snapshots/nanox_try_to_blind_sign_with_setting_disabled/00000.png b/tests/snapshots/nanox_try_to_blind_sign_with_setting_disabled/00000.png
index d5722b0..0446ee7 100644
Binary files a/tests/snapshots/nanox_try_to_blind_sign_with_setting_disabled/00000.png and b/tests/snapshots/nanox_try_to_blind_sign_with_setting_disabled/00000.png differ
diff --git a/tests/snapshots/nanox_try_to_blind_sign_with_setting_disabled/00001.png b/tests/snapshots/nanox_try_to_blind_sign_with_setting_disabled/00001.png
index 7a77cb1..a58590b 100644
Binary files a/tests/snapshots/nanox_try_to_blind_sign_with_setting_disabled/00001.png and b/tests/snapshots/nanox_try_to_blind_sign_with_setting_disabled/00001.png differ
diff --git a/tests/src/contract_data_warning.test.js b/tests/src/contract_data_warning.test.js
index 49fb200..7047968 100644
--- a/tests/src/contract_data_warning.test.js
+++ b/tests/src/contract_data_warning.test.js
@@ -2,34 +2,23 @@ import 'core-js/stable';
 import 'regenerator-runtime/runtime';
 import { expect } from "../jest";
 import { TransportStatusError } from "@ledgerhq/errors";
-import { waitForAppScreen, zemu } from './test.fixture';
+import { waitForAppScreen, zemu, nano_models } from './test.fixture';
 import Zemu from '@zondax/zemu';
 
-test('[Nano S] Try to blind sign with setting disabled', zemu("nanos", async (sim, eth) => {
-  // we can't use eth.signTransaction because it detects that contract data is disabled and fails early
-  let transport = await sim.getTransport();
-  let buffer = Buffer.from("058000002c8000003c800000010000000000000000f849208506fc23ac008303dc3194f650c3d88d12db855b8bf7d11be6c55a4e07dcc980a4a1712d6800000000000000000000000000000000000000000000000000000000000acbc7018080", "hex");
-  let tx = transport.send(0xe0, 0x04, 0x00, 0x00, buffer);
+nano_models.forEach(function(model) {
+    test('[Nano ' + model.letter + '] Try to blind sign with setting disabled', zemu(model, async (sim, eth) => {
+      // we can't use eth.signTransaction because it detects that contract data is disabled and fails early
+      let transport = await sim.getTransport();
+      let buffer = Buffer.from("058000002c8000003c800000010000000000000000f849208506fc23ac008303dc3194f650c3d88d12db855b8bf7d11be6c55a4e07dcc980a4a1712d6800000000000000000000000000000000000000000000000000000000000acbc7018080", "hex");
+      let tx = transport.send(0xe0, 0x04, 0x00, 0x00, buffer);
 
-  await expect(tx).rejects.toEqual(new TransportStatusError(0x6a80));
+      await expect(tx).rejects.toEqual(new TransportStatusError(0x6a80));
 
-  await Zemu.sleep(1000);
-  await waitForAppScreen(sim);
-  await sim.navigateAndCompareSnapshots('.', 'nanos_try_to_blind_sign_with_setting_disabled', [1, 0]);
-}));
-
-test.skip('[Nano X] Try to blind sign with setting disabled', zemu("nanox", async (sim, eth) => {
-  // disable blind signing
-  await sim.navigateAndCompareSnapshots('.', 'nanox_disable_blind_signing', [-2, 0, 0, 3, 0]);
-
-  // we can't use eth.signTransaction because it detects that contract data is disabled and fails early
-  let transport = await sim.getTransport();
-  let buffer = Buffer.from("058000002c8000003c800000010000000000000000f849208506fc23ac008303dc3194f650c3d88d12db855b8bf7d11be6c55a4e07dcc980a4a1712d6800000000000000000000000000000000000000000000000000000000000acbc7018080", "hex");
-  let tx = transport.send(0xe0, 0x04, 0x00, 0x00, buffer);
-
-  await expect(tx).rejects.toEqual(new TransportStatusError(0x6a80));
-
-  await Zemu.sleep(1000);
-  await waitForAppScreen(sim);
-  await sim.navigateAndCompareSnapshots('.', 'nanox_try_to_blind_sign_with_setting_disabled', [0]);
-}));
+      await Zemu.sleep(1000);
+      await waitForAppScreen(sim);
+      let clicks;
+      if (model.letter === 'S') clicks = [1, 0];
+      else clicks = [0];
+      await sim.navigateAndCompareSnapshots('.', model.name + '_try_to_blind_sign_with_setting_disabled', clicks);
+    }));
+});