diff --git a/tests/cli_query_reapply.sh b/tests/cli_query_reapply.sh
new file mode 100755
index 0000000..50cba9d
--- /dev/null
+++ b/tests/cli_query_reapply.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -ex
+
+TMP_FILE=$(mktemp /tmp/nmstate.XXXXXX.yaml)
+
+nmstatectl show > $TMP_FILE 2>/dev/null
+
+nmstatectl set $TMP_FILE 2>/dev/null
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..ce55f12
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,12 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    remote_user: root
+    tests:
+    - cli_query_reapply:
+        dir: .
+        run: ./cli_query_reapply.sh
+    required_packages:
+    - nmstate