diff --git a/tests/extmod/machine_timer.py b/tests/extmod/machine_timer.py
new file mode 100644
index 0000000000..b7e6a280f9
--- /dev/null
+++ b/tests/extmod/machine_timer.py
@@ -0,0 +1,37 @@
+# test machine.Timer
+
+try:
+    import utime, umachine as machine
+    machine.Timer
+except:
+    print("SKIP")
+    raise SystemExit
+
+# create and deinit
+t = machine.Timer(freq=1)
+t.deinit()
+
+# deinit again
+t.deinit()
+
+# create 2 and deinit
+t = machine.Timer(freq=1)
+t2 = machine.Timer(freq=1)
+t.deinit()
+t2.deinit()
+
+# create 2 and deinit in different order
+t = machine.Timer(freq=1)
+t2 = machine.Timer(freq=1)
+t2.deinit()
+t.deinit()
+
+# create one-shot timer with callback and wait for it to print (should be just once)
+t = machine.Timer(period=1, mode=machine.Timer.ONE_SHOT, callback=lambda t:print('one-shot'))
+utime.sleep_ms(5)
+t.deinit()
+
+# create periodic timer with callback and wait for it to print
+t = machine.Timer(period=4, mode=machine.Timer.PERIODIC, callback=lambda t:print('periodic'))
+utime.sleep_ms(14)
+t.deinit()
diff --git a/tests/extmod/machine_timer.py.exp b/tests/extmod/machine_timer.py.exp
new file mode 100644
index 0000000000..2dd85ba67d
--- /dev/null
+++ b/tests/extmod/machine_timer.py.exp
@@ -0,0 +1,4 @@
+one-shot
+periodic
+periodic
+periodic