diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 27bb96e..e2a187b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,6 +11,7 @@ if(ENABLE_CJSON_TEST)
         parse_number
         parse_hex4
         parse_string
+        parse_array
     )
 
     foreach(unity_test ${unity_tests})
diff --git a/tests/parse_array.c b/tests/parse_array.c
new file mode 100644
index 0000000..306964c
--- /dev/null
+++ b/tests/parse_array.c
@@ -0,0 +1,166 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "unity/examples/unity_config.h"
+#include "unity/src/unity.h"
+#include "../cJSON.c"
+
+static cJSON item[1];
+
+static const unsigned char *error_pointer = NULL;
+
+static void assert_is_array(cJSON *string_item)
+{
+    TEST_ASSERT_NOT_NULL_MESSAGE(string_item, "Item is NULL.");
+
+    TEST_ASSERT_NULL_MESSAGE(string_item->next, "Linked list next pointer is not NULL.");
+    TEST_ASSERT_NULL_MESSAGE(string_item->prev, "Linked list previous pointer is not NULL");
+    TEST_ASSERT_BITS_MESSAGE(0xFF, cJSON_Array, string_item->type, "Item type is not array.");
+    TEST_ASSERT_BITS_MESSAGE(cJSON_IsReference, 0, string_item->type, "Item should not have a string as reference.");
+    TEST_ASSERT_BITS_MESSAGE(cJSON_StringIsConst, 0, string_item->type, "Item should not have a const string.");
+    TEST_ASSERT_NULL_MESSAGE(string_item->valuestring, "Valuestring is not NULL.");
+    TEST_ASSERT_NULL_MESSAGE(string_item->string, "String is not NULL.");
+}
+
+static void assert_not_array(const char *json)
+{
+    TEST_ASSERT_NULL(parse_array(item, (const unsigned char*)json, &error_pointer));
+}
+
+static void assert_parse_array(const char *json)
+{
+    TEST_ASSERT_NOT_NULL(parse_array(item, (const unsigned char*)json, &error_pointer));
+    assert_is_array(item);
+}
+
+static void reset(void)
+{
+    if (item->child != NULL)
+    {
+        cJSON_Delete(item->child);
+    }
+    memset(item, 0, sizeof(cJSON));
+}
+
+static void parse_array_should_parse_empty_arrays(void)
+{
+    assert_parse_array("[]");
+    TEST_ASSERT_NULL(item->child);
+    assert_parse_array("[\n\t]");
+    TEST_ASSERT_NULL(item->child);
+}
+
+
+static void parse_array_should_parse_arrays_with_one_element(void)
+{
+
+    assert_parse_array("[1]");
+    TEST_ASSERT_NOT_NULL(item->child);
+    TEST_ASSERT_BITS(0xFF, cJSON_Number, item->child->type);
+    reset();
+
+    assert_parse_array("[\"hello!\"]");
+    TEST_ASSERT_NOT_NULL(item->child);
+    TEST_ASSERT_BITS(0xFF, cJSON_String, item->child->type);
+    TEST_ASSERT_EQUAL_STRING("hello!", item->child->valuestring);
+    reset();
+
+    assert_parse_array("[[]]");
+    TEST_ASSERT_NOT_NULL(item->child);
+    assert_is_array(item->child);
+    TEST_ASSERT_NULL(item->child->child);
+    reset();
+
+    assert_parse_array("[null]");
+    TEST_ASSERT_NOT_NULL(item->child);
+    TEST_ASSERT_BITS(0xFF, cJSON_NULL, item->child->type);
+    reset();
+}
+
+static void parse_array_should_parse_arrays_with_multiple_elements(void)
+{
+    assert_parse_array("[1\t,\n2, 3]");
+    TEST_ASSERT_NOT_NULL(item->child);
+    TEST_ASSERT_NOT_NULL(item->child->next);
+    TEST_ASSERT_NOT_NULL(item->child->next->next);
+    TEST_ASSERT_NULL(item->child->next->next->next);
+    TEST_ASSERT_BITS(0xFF, cJSON_Number, item->child->type);
+    TEST_ASSERT_BITS(0xFF, cJSON_Number, item->child->next->type);
+    TEST_ASSERT_BITS(0xFF, cJSON_Number, item->child->next->next->type);
+    reset();
+
+    {
+        size_t i = 0;
+        cJSON *node = NULL;
+        int expected_types[7] =
+        {
+            cJSON_Number,
+            cJSON_NULL,
+            cJSON_True,
+            cJSON_False,
+            cJSON_Array,
+            cJSON_String,
+            cJSON_Object
+        };
+        assert_parse_array("[1, null, true, false, [], \"hello\", {}]");
+
+        node = item->child;
+        for (
+                i = 0;
+                (i < (sizeof(expected_types)/sizeof(int)))
+                && (node != NULL);
+                i++, node = node->next)
+        {
+            TEST_ASSERT_BITS(0xFF, expected_types[i], node->type);
+        }
+        TEST_ASSERT_EQUAL_INT(i, 7);
+        reset();
+    }
+}
+
+static void parse_array_should_not_parse_non_arrays(void)
+{
+    assert_not_array("");
+    assert_not_array("[");
+    assert_not_array("]");
+    assert_not_array("{\"hello\":[]}");
+    assert_not_array("42");
+    assert_not_array("3.14");
+    assert_not_array("\"[]hello world!\n\"");
+}
+
+int main(void)
+{
+    /* initialize cJSON item */
+    memset(item, 0, sizeof(cJSON));
+
+    UNITY_BEGIN();
+    RUN_TEST(parse_array_should_parse_empty_arrays);
+    RUN_TEST(parse_array_should_parse_arrays_with_one_element);
+    RUN_TEST(parse_array_should_parse_arrays_with_multiple_elements);
+    RUN_TEST(parse_array_should_not_parse_non_arrays);
+    return UNITY_END();
+}