diff --git a/tests/common/Makefile.am b/tests/common/Makefile.am
index f7dbbe28..c9a1fed5 100644
--- a/tests/common/Makefile.am
+++ b/tests/common/Makefile.am
@@ -14,6 +14,7 @@ check_PROGRAMS = test_common
 test_common_SOURCES = \
     test_common.h \
     test_common_main.c \
+    test_list_calls.c \
     test_string_calls.c \
     test_os_calls.c \
     test_ssl_calls.c \
diff --git a/tests/common/test_common.h b/tests/common/test_common.h
index 1878bafb..9aead07c 100644
--- a/tests/common/test_common.h
+++ b/tests/common/test_common.h
@@ -7,6 +7,7 @@
 char *
 bin_to_hex(const char *input, int length);
 
+Suite *make_suite_test_list(void);
 Suite *make_suite_test_string(void);
 Suite *make_suite_test_os_calls(void);
 Suite *make_suite_test_ssl_calls(void);
diff --git a/tests/common/test_common_main.c b/tests/common/test_common_main.c
index 4ad60f34..68a3ba16 100644
--- a/tests/common/test_common_main.c
+++ b/tests/common/test_common_main.c
@@ -46,12 +46,12 @@ int main (void)
     int number_failed;
     SRunner *sr;
 
-    sr = srunner_create (make_suite_test_string());
+    sr = srunner_create (make_suite_test_list());
+    srunner_add_suite(sr, make_suite_test_string());
     srunner_add_suite(sr, make_suite_test_os_calls());
     srunner_add_suite(sr, make_suite_test_ssl_calls());
     srunner_add_suite(sr, make_suite_test_base64());
     srunner_add_suite(sr, make_suite_test_guid());
-    //   srunner_add_suite(sr, make_list_suite());
 
     srunner_set_tap(sr, "-");
     /*
diff --git a/tests/common/test_list_calls.c b/tests/common/test_list_calls.c
new file mode 100644
index 00000000..af6f41c2
--- /dev/null
+++ b/tests/common/test_list_calls.c
@@ -0,0 +1,132 @@
+
+#if defined(HAVE_CONFIG_H)
+#include "config_ac.h"
+#endif
+
+#include "list.h"
+
+#include "test_common.h"
+#include "os_calls.h"
+#include "string_calls.h"
+
+#define TEST_LIST_SIZE 1000
+
+START_TEST(test_list__simple)
+{
+    struct list *lst = list_create();
+    int i;
+    int val;
+    for (i = 0 ; i < TEST_LIST_SIZE ; ++i)
+    {
+        list_add_item(lst, i);
+    }
+
+    ck_assert_int_eq(lst->count, TEST_LIST_SIZE);
+    for (i = 0 ; i < TEST_LIST_SIZE ; ++i)
+    {
+        ck_assert_int_eq(lst->items[i], i);
+        // Also check get method
+        val = list_get_item(lst, i);
+        ck_assert_int_eq(val, i);
+    }
+
+    i = list_index_of(lst, 50);
+    ck_assert_int_eq(i, 50);
+
+    list_remove_item(lst, 10);
+    ck_assert_int_eq(lst->count, TEST_LIST_SIZE - 1);
+    val = list_get_item(lst, 10);
+    ck_assert_int_eq(val, 11);
+
+    list_insert_item(lst, 10, 10);
+    ck_assert_int_eq(lst->count, TEST_LIST_SIZE);
+    val = list_get_item(lst, 10);
+    ck_assert_int_eq(val, 10);
+
+    list_clear(lst);
+    ck_assert_int_eq(lst->count, 0);
+    list_delete(lst);
+}
+END_TEST
+
+// This needs to be run through valgrind to truly check all memory is
+// being de-allocated
+START_TEST(test_list__simple_auto_free)
+{
+    struct list *lst = list_create();
+    lst->auto_free = 1;
+
+    int i;
+    for (i = 0 ; i < TEST_LIST_SIZE ; ++i)
+    {
+        char strval[64];
+        g_snprintf(strval, sizeof(strval), "%d", i);
+        list_add_item(lst, (tintptr)g_strdup(strval));
+    }
+
+    list_remove_item(lst, 0);
+    list_remove_item(lst, 0);
+    list_remove_item(lst, 0);
+    list_remove_item(lst, 0);
+    list_remove_item(lst, 0);
+    ck_assert_int_eq(lst->count, TEST_LIST_SIZE - 5);
+    list_delete(lst);
+}
+END_TEST
+
+START_TEST(test_list__simple_append_list)
+{
+    int i;
+    struct list *src = list_create();
+    struct list *dst = list_create();
+    src->auto_free = 0;
+    dst->auto_free = 1;
+
+    list_add_item(src, (tintptr)"6");
+    list_add_item(src, (tintptr)"7");
+    list_add_item(src, (tintptr)"8");
+    list_add_item(src, (tintptr)"9");
+    list_add_item(src, (tintptr)"10");
+    list_add_item(src, (tintptr)"11");
+
+    list_add_item(dst, (tintptr)g_strdup("0"));
+    list_add_item(dst, (tintptr)g_strdup("1"));
+    list_add_item(dst, (tintptr)g_strdup("2"));
+    list_add_item(dst, (tintptr)g_strdup("3"));
+    list_add_item(dst, (tintptr)g_strdup("4"));
+    list_add_item(dst, (tintptr)g_strdup("5"));
+
+    list_append_list_strdup(src, dst, 0);
+
+    ck_assert_int_eq(dst->count, 12);
+
+    for (i = 0 ; i < dst->count; ++i)
+    {
+        int val = g_atoi((const char *)list_get_item(dst, i));
+        ck_assert_int_eq(val, i);
+    }
+
+    list_delete(src);
+    list_clear(dst);  // Exercises auto_free code paths in list.c
+    list_delete(dst);
+}
+END_TEST
+
+/******************************************************************************/
+
+Suite *
+make_suite_test_list(void)
+{
+    Suite *s;
+    TCase *tc_simple;
+
+    s = suite_create("List");
+
+    tc_simple = tcase_create("simple");
+    suite_add_tcase(s, tc_simple);
+    tcase_add_test(tc_simple, test_list__simple);
+    tcase_add_test(tc_simple, test_list__simple_auto_free);
+    tcase_add_test(tc_simple, test_list__simple_append_list);
+
+    return s;
+}