diff --git a/libguac/tests/Makefile.am b/libguac/tests/Makefile.am
index 28ccc9b4..435258d3 100644
--- a/libguac/tests/Makefile.am
+++ b/libguac/tests/Makefile.am
@@ -51,6 +51,7 @@ test_libguac_SOURCES =           \
 	protocol/instruction_read.c  \
 	protocol/instruction_write.c \
 	client/client_suite.c        \
+	client/buffer_pool.c         \
 	client/layer_pool.c
 
 test_libguac_LDADD = $(top_builddir)/src/libguac.la @CUNIT_LIBS@
diff --git a/libguac/tests/client/buffer_pool.c b/libguac/tests/client/buffer_pool.c
new file mode 100644
index 00000000..2cd5f07f
--- /dev/null
+++ b/libguac/tests/client/buffer_pool.c
@@ -0,0 +1,88 @@
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is libguac.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <CUnit/Basic.h>
+
+#include "client.h"
+#include "client_suite.h"
+
+void test_buffer_pool() {
+
+    guac_client* client;
+
+    int i;
+    int seen[GUAC_BUFFER_POOL_INITIAL_SIZE] = {0};
+
+    guac_layer* layer;
+
+    /* Get client */
+    client = guac_client_alloc();
+    CU_ASSERT_PTR_NOT_NULL_FATAL(client);
+
+    /* Fill pool */
+    for (i=0; i<GUAC_BUFFER_POOL_INITIAL_SIZE; i++) {
+
+        /* Allocate and throw away a layer (should not disturb buffer alloc) */
+        CU_ASSERT_PTR_NOT_NULL_FATAL(guac_client_alloc_layer(client));
+
+        layer = guac_client_alloc_buffer(client);
+
+        /* Index should be within pool size */
+        CU_ASSERT_PTR_NOT_NULL_FATAL(layer);
+        CU_ASSERT(layer->index < 0);
+        CU_ASSERT(layer->index >= -GUAC_BUFFER_POOL_INITIAL_SIZE);
+
+        /* This should be a layer we have not seen yet */
+        CU_ASSERT_FALSE(seen[-layer->index - 1]);
+        seen[-layer->index - 1] = 1;
+
+        guac_client_free_buffer(client, layer);
+
+    }
+
+    /* Now that pool is filled, we should get a previously seen layer */
+    layer = guac_client_alloc_buffer(client);
+
+    CU_ASSERT(layer->index < 0);
+    CU_ASSERT(layer->index >= -GUAC_BUFFER_POOL_INITIAL_SIZE);
+    CU_ASSERT_TRUE(seen[-layer->index - 1]);
+
+    /* Free client */
+    guac_client_free(client);
+
+}
+
diff --git a/libguac/tests/client/client_suite.c b/libguac/tests/client/client_suite.c
index 9840e884..b2c83c72 100644
--- a/libguac/tests/client/client_suite.c
+++ b/libguac/tests/client/client_suite.c
@@ -60,6 +60,7 @@ int register_client_suite() {
     /* Add tests */
     if (
         CU_add_test(suite, "layer-pool", test_layer_pool) == NULL
+     || CU_add_test(suite, "buffer-pool", test_buffer_pool) == NULL
        ) {
         CU_cleanup_registry();
         return CU_get_error();
diff --git a/libguac/tests/client/client_suite.h b/libguac/tests/client/client_suite.h
index 44a9017e..804c85dd 100644
--- a/libguac/tests/client/client_suite.h
+++ b/libguac/tests/client/client_suite.h
@@ -41,6 +41,7 @@
 int register_client_suite();
 
 void test_layer_pool();
+void test_buffer_pool();
 
 #endif