diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 02409be1a..42af122cb 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -123,8 +123,14 @@ jobs:
     needs: core_emu
     strategy:
       matrix:
-        model: [T2T1]  # FIXME: T2B1 https://github.com/trezor/trezor-firmware/issues/2724
+        model: [T2T1, T2B1]
         asan: ${{ fromJSON(github.event_name == 'schedule' && '["noasan", "asan"]' || '["noasan"]') }}
+        # T2B1 fails due to rust clippy error which is hard to reproduce, see discussion here:
+        # https://github.com/trezor/trezor-firmware/pull/2196
+        # The problem might be in conflicting versions of clippy, let's see if this helps:
+        # https://github.com/trezor/trezor-firmware/issues/3337
+        exclude:
+          - model: T2B1
     env:
       TREZOR_MODEL: ${{ matrix.model == 'T2T1' && 'T' || 'R' }}
       ADDRESS_SANITIZER: ${{ matrix.asan == 'asan' && '1' || '0' }}
@@ -146,7 +152,7 @@ jobs:
     needs: core_emu
     strategy:
       matrix:
-        model: [T2T1]  # FIXME: T2B1 https://github.com/trezor/trezor-firmware/issues/2724
+        model: [T2T1, T2B1]
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/rust/trezor-client/src/lib.rs b/rust/trezor-client/src/lib.rs
index aec027266..7d0ccfdcc 100644
--- a/rust/trezor-client/src/lib.rs
+++ b/rust/trezor-client/src/lib.rs
@@ -171,10 +171,10 @@ mod tests {
         assert_eq!(features.vendor(), "trezor.io");
         assert_eq!(features.initialized(), true);
         assert_eq!(features.firmware_present(), false);
-        assert_eq!(features.model(), "T");
         assert_eq!(features.initialized(), true);
         assert_eq!(features.pin_protection(), false);
         assert_eq!(features.passphrase_protection(), false);
+        assert!(["T", "Safe 3"].contains(&features.model()));
     }
 
     #[test]