diff --git a/test/test_lazybuffer.py b/test/test_lazybuffer.py
index 8da2e36338..cda8b4c467 100644
--- a/test/test_lazybuffer.py
+++ b/test/test_lazybuffer.py
@@ -2,8 +2,8 @@
 import numpy as np
 import unittest
 from tinygrad.lazy import LazyBuffer
-from tinygrad import Device
-from tinygrad.tensor import Tensor
+from tinygrad import Tensor, Device, dtypes
+from tinygrad.device import Interpreted
 
 class TestLazyBuffer(unittest.TestCase):
   @unittest.skip("it doesn't work like this anymore")
@@ -51,10 +51,29 @@ class TestLazyBuffer(unittest.TestCase):
     assert a.device == b.device
 
   def test_shrink_const_into_zero(self):
+    # regression test to make sure the shapetracker is preserved
     a = Tensor.zeros(4,4,4).shrink((None, (0,0), None))
     b = Tensor.zeros(4,1,4)
     c = a.cat(b, dim=1)
     np.testing.assert_allclose(c.numpy(), np.concatenate((a.numpy(), b.numpy()), axis=1))
 
+  def test_shrink_const_then_cast(self):
+    # regression test to make sure the shapetracker is preserved
+    a = Tensor.zeros(4,4,4).shrink((None, (0,0), None)).cast(dtypes.int32)
+    b = Tensor.zeros(4,1,4)
+    c = a.cat(b, dim=1)
+
+    if isinstance(Device[Device.DEFAULT], Interpreted):
+      # TODO: fix cast resets shapetracker and remove this block
+      # this is expectedFailure with a condition
+      try:
+        np.testing.assert_allclose(c.numpy(), np.concatenate((a.numpy(), b.numpy()), axis=1))
+      except Exception:
+        pass
+      else:
+        raise ValueError("assert_allclose not failed")
+    else:
+      np.testing.assert_allclose(c.numpy(), np.concatenate((a.numpy(), b.numpy()), axis=1))
+
 if __name__ == "__main__":
   unittest.main()
diff --git a/test/unit/test_disk_tensor.py b/test/unit/test_disk_tensor.py
index 1700f4a499..4826c0e25c 100644
--- a/test/unit/test_disk_tensor.py
+++ b/test/unit/test_disk_tensor.py
@@ -1,10 +1,9 @@
 import pathlib
 import unittest
 import numpy as np
-from tinygrad.tensor import Tensor, Device, dtypes
+from tinygrad import Tensor, Device, dtypes
 from tinygrad.nn.state import safe_load, safe_save, get_state_dict, torch_load
-from tinygrad.helpers import CI, fetch, temp
-from tinygrad.helpers import Timing
+from tinygrad.helpers import Timing, CI, fetch, temp
 
 def compare_weights_both(url):
   import torch