diff --git a/test/qcbor_decode_tests.c b/test/qcbor_decode_tests.c
index acde3ca..88203ff 100644
--- a/test/qcbor_decode_tests.c
+++ b/test/qcbor_decode_tests.c
@@ -919,6 +919,46 @@
 }
 
 /* [[[[[[[[[[]]]]]]]]]] */
+static uint8_t sEmptyMap[] = {
+                              0xA1,     //# map(1)
+                              0x02,     //# unsigned(2)
+                              0xA0,     //# map(0)
+};
+
+int32_t ParseEmptyMapInMapTest(void)
+{
+   QCBORDecodeContext DCtx;
+   QCBORItem Item;
+   int nReturn = 0;
+
+   QCBORDecode_Init(&DCtx,
+                    UsefulBuf_FROM_BYTE_ARRAY_LITERAL(sEmptyMap),
+                    QCBOR_DECODE_MODE_NORMAL);
+
+   /* now open the first Map */
+   nReturn = QCBORDecode_GetNext(&DCtx, &Item);
+    if(nReturn != QCBOR_SUCCESS ||
+       Item.uDataType != QCBOR_TYPE_MAP) {
+      nReturn = -3;
+      goto done;
+    }
+
+   if(QCBORDecode_GetNext(&DCtx, &Item) != 0) {
+     nReturn = -1;
+     goto done;
+   }
+   if(Item.uDataType != QCBOR_TYPE_MAP ||
+      Item.uNestingLevel != 1 ||
+      Item.label.int64 != 2) {
+     nReturn = -2;
+     goto done;
+   }
+
+ done:
+   return(nReturn);
+}
+
+/* [[[[[[[[[[]]]]]]]]]] */
 static const uint8_t spDeepArrays[] = {
    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
    0x81, 0x80};
diff --git a/test/qcbor_decode_tests.h b/test/qcbor_decode_tests.h
index 7e11e35..e6a22f6 100644
--- a/test/qcbor_decode_tests.h
+++ b/test/qcbor_decode_tests.h
@@ -112,6 +112,10 @@
  */
 int32_t ParseMapTest(void);
 
+/*
+  Parses a map that contains a zero-length map as value.
+*/
+int32_t ParseEmptyMapInMapTest(void);
 
 /*
 Test the decoder mode where maps are treated as arrays.
diff --git a/test/run_tests.c b/test/run_tests.c
index 0146d93..5fb0895 100644
--- a/test/run_tests.c
+++ b/test/run_tests.c
@@ -130,6 +130,7 @@
     TEST_ENTRY(ExponentAndMantissaDecodeFailTests),
     TEST_ENTRY(ExponentAndMantissaEncodeTests),
 #endif /* QCBOR_CONFIG_DISABLE_EXP_AND_MANTISSA */
+    TEST_ENTRY(ParseEmptyMapInMapTest),
 };