diff --git a/tests/device_tests/test_u2f_counter.py b/tests/device_tests/test_u2f_counter.py
new file mode 100644
index 000000000..ee8b0a3a9
--- /dev/null
+++ b/tests/device_tests/test_u2f_counter.py
@@ -0,0 +1,27 @@
+# This file is part of the Trezor project.
+#
+# Copyright (C) 2012-2019 SatoshiLabs and contributors
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the License along with this library.
+# If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
+
+from trezorlib import device
+
+
+def test_set_u2f_counter(client):
+    assert device.get_next_u2f_counter(client) == 0
+    assert device.get_next_u2f_counter(client) == 1
+    device.set_u2f_counter(client, 111111)
+    assert device.get_next_u2f_counter(client) == 111112
+    assert device.get_next_u2f_counter(client) == 111113
+    device.set_u2f_counter(client, 0)
+    assert device.get_next_u2f_counter(client) == 1