diff --git a/t/Makefile.am b/t/Makefile.am
index c6b6c14..e675832 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -35,7 +35,7 @@ endif
 TESTS =
 
 # libcryb-core
-TESTS += t_ctype t_strlcat
+TESTS += t_ctype t_strlcat t_strlcpy
 
 # libcryb-enc
 TESTS += t_rfc3986 t_rfc4648
diff --git a/t/t_strlcpy.c b/t/t_strlcpy.c
new file mode 100644
index 0000000..dc19da1
--- /dev/null
+++ b/t/t_strlcpy.c
@@ -0,0 +1,127 @@
+/*-
+ * Copyright (c) 2014 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Author: Dag-Erling Smørgrav <des@des.no>
+ *
+ * $Cryb$
+ */
+
+#include "cryb/impl.h"
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#undef HAVE_STRLCPY
+#include <cryb/strlcpy.h>
+
+#include "t.h"
+
+#define T_MAGIC_STR	"squeamish ossifrage"
+#define T_MAGIC_LEN	(sizeof(T_MAGIC_STR) - 1)
+#define T_BUFSIZE	(T_MAGIC_LEN + 1 + T_MAGIC_LEN + 1)
+#define T_CANARY	0x7f
+
+struct t_case {
+	const char *desc;
+	const char *in;
+	const char *out;
+	size_t sz;
+};
+
+/***************************************************************************
+ * Test cases
+ */
+static struct t_case t_cases[] = {
+	{
+		.desc	= "empty",
+		.in	= "",
+		.out	= "",
+		.sz	= 0,
+	},
+	{
+		.desc	= "short",
+		.in	= T_MAGIC_STR,
+		.out	= T_MAGIC_STR,
+		.sz	= T_MAGIC_LEN,
+	},
+	{
+		.desc	= "full",
+		.in	= T_MAGIC_STR " " T_MAGIC_STR,
+		.out	= T_MAGIC_STR " " T_MAGIC_STR,
+		.sz	= T_BUFSIZE - 1,
+	},
+	{
+		.desc	= "overflow",
+		.in	= T_MAGIC_STR " " T_MAGIC_STR " " T_MAGIC_STR,
+		.out	= T_MAGIC_STR " " T_MAGIC_STR,
+		.sz	= T_MAGIC_LEN + 1 + T_MAGIC_LEN + 1 + T_MAGIC_LEN,
+	},
+};
+
+/***************************************************************************
+ * Test function
+ */
+static int
+t_strlcpy(char **desc CRYB_UNUSED, void *arg)
+{
+	struct t_case *t = arg;
+	char buf[T_BUFSIZE + 1];
+	size_t sz;
+
+	memset(buf, T_CANARY, sizeof buf);
+	sz = strlcpy(buf, t->in, T_BUFSIZE);
+	if (buf[T_BUFSIZE] != T_CANARY) {
+		t_verbose("buffer overflow\n");
+		return (0);
+	}
+	return (t_compare_sz(t->sz, sz) & t_compare_str(t->out, buf));
+}
+
+
+/***************************************************************************
+ * Boilerplate
+ */
+
+int
+t_prepare(int argc, char *argv[])
+{
+	int i, n;
+
+	(void)argc;
+	(void)argv;
+	n = sizeof t_cases / sizeof t_cases[0];
+	for (i = 0; i < n; ++i)
+		t_add_test(t_strlcpy, &t_cases[i], t_cases[i].desc);
+	return (0);
+}
+
+void
+t_cleanup(void)
+{
+}