diff --git a/test/Makefile.am b/test/Makefile.am
index 41e859b..4cde675 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -39,7 +39,8 @@
 	firmware_state_verificationstarted_unittest \
 	firmware_state_verificationcompleted_unittest \
 	firmware_state_updatepending_unittest \
-	firmware_state_updatestarted_unittest
+	firmware_state_updatestarted_unittest \
+	firmware_state_updatecompleted_unittest
 
 if BUILD_HOST_TOOL
 check_PROGRAMS += \
@@ -107,6 +108,9 @@
 firmware_state_updatestarted_unittest_SOURCES = firmware_state_updatestarted_unittest.cpp
 firmware_state_updatestarted_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
 
+firmware_state_updatecompleted_unittest_SOURCES = firmware_state_updatecompleted_unittest.cpp
+firmware_state_updatecompleted_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+
 if BUILD_HOST_TOOL
 tools_bt_unittest_SOURCES = tools_bt_unittest.cpp
 tools_bt_unittest_LDADD = $(top_builddir)/tools/libupdater.la
diff --git a/test/firmware_state_updatecompleted_unittest.cpp b/test/firmware_state_updatecompleted_unittest.cpp
new file mode 100644
index 0000000..c686ae1
--- /dev/null
+++ b/test/firmware_state_updatecompleted_unittest.cpp
@@ -0,0 +1,7 @@
+/* The goal of these tests is to verify the behavior of all blob commands given
+ * the current state is UpdateCompleted.  This state is achieved as an exit from
+ * updateStarted.
+ *
+ * This can be reached with success or failure from an update, and is reached
+ * via a stat() call from updatedStarted.
+ */