diff --git a/test/test_lazybuffer.py b/test/test_lazybuffer.py
index bf32055aaa..3da4815db8 100644
--- a/test/test_lazybuffer.py
+++ b/test/test_lazybuffer.py
@@ -45,7 +45,7 @@ class TestLazyBuffer(unittest.TestCase):
     z = Tensor([1, np.e]).numpy()
     np.testing.assert_allclose(y, z)
 
-  def test_device_canonicalize(self):
+  def test_device_0_is_the_same_device(self):
     a = Tensor([1, 2, 3], f"{Device.DEFAULT}")
     b = Tensor([1, 2, 3], f"{Device.DEFAULT}:0")
     assert a.device == b.device
diff --git a/test/unit/test_device.py b/test/unit/test_device.py
new file mode 100644
index 0000000000..7ee0939edc
--- /dev/null
+++ b/test/unit/test_device.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+import unittest
+from tinygrad.device import Device
+
+class TestDevice(unittest.TestCase):
+  def test_canonicalize(self):
+    assert Device.canonicalize(None) == Device.DEFAULT
+    assert Device.canonicalize("CPU") == "CPU"
+    assert Device.canonicalize("cpu") == "CPU"
+    assert Device.canonicalize("GPU") == "GPU"
+    assert Device.canonicalize("GPU:0") == "GPU"
+    assert Device.canonicalize("gpu:0") == "GPU"
+    assert Device.canonicalize("GPU:1") == "GPU:1"
+    assert Device.canonicalize("gpu:1") == "GPU:1"
+    assert Device.canonicalize("GPU:2") == "GPU:2"
+    assert Device.canonicalize("disk:/dev/shm/test") == "DISK:/dev/shm/test"
+
+if __name__ == "__main__":
+  unittest.main()