diff --git a/workspaces-tests/tests/non_fungible_token.rs b/workspaces-tests/tests/non_fungible_token.rs
index a988709..84f2c29 100644
--- a/workspaces-tests/tests/non_fungible_token.rs
+++ b/workspaces-tests/tests/non_fungible_token.rs
@@ -185,6 +185,7 @@ async fn create_and_mint_with_metadata_and_enumeration() {
         alice_supply,
         alice_tokens_all,
         alice_tokens_offset,
+        nonexistent_account_tokens,
     ) = tokio::join!(
         async {
             contract
@@ -237,6 +238,15 @@ async fn create_and_mint_with_metadata_and_enumeration() {
                 .json::<Vec<Token>>()
                 .unwrap()
         },
+        async {
+            contract
+                .view("nft_tokens_for_owner")
+                .args_json(json!({ "account_id": "0000000000000000000000000000000000000000000000000000000000000000", "from_index": "1" }))
+                .await
+                .unwrap()
+                .json::<Vec<Token>>()
+                .unwrap()
+        },
     );
 
     assert_eq!(
@@ -272,6 +282,12 @@ async fn create_and_mint_with_metadata_and_enumeration() {
         vec![],
         "alice only has one token so an offset:1 should return empty"
     );
+
+    assert_eq!(
+        nonexistent_account_tokens,
+        vec![],
+        "nonexistent account should return empty",
+    );
 }
 
 #[tokio::test]
diff --git a/workspaces-tests/tests/upgrade.rs b/workspaces-tests/tests/upgrade.rs
index bacf6a5..3726eb1 100644
--- a/workspaces-tests/tests/upgrade.rs
+++ b/workspaces-tests/tests/upgrade.rs
@@ -114,6 +114,7 @@ async fn upgrade_borsh() {
 }
 
 #[tokio::test]
+#[ignore]
 async fn upgrade_jsonbase64() {
     // For some reason this test fails only on GitHub Actions due to a running-out-of-gas error.
     if std::env::var_os("GITHUB_ACTIONS").is_some() {