diff --git a/src/tests.c b/src/tests.c
index 39d9cd0c9..fb736c744 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -6,6 +6,7 @@
 
 #include <util/base36_test.c>
 #include <util/quicklist_test.c>
+#include <util/functions_test.c>
 #include <kernel/move_test.c>
 #include <kernel/spell_test.c>
 #include <kernel/curse_test.c>
@@ -36,6 +37,7 @@ int RunAllTests(void)
 
   CuSuiteAddSuite(suite, get_base36_suite());
   CuSuiteAddSuite(suite, get_quicklist_suite());
+  CuSuiteAddSuite(suite, get_functions_suite());
   CuSuiteAddSuite(suite, get_curse_suite());
   CuSuiteAddSuite(suite, get_market_suite());
   CuSuiteAddSuite(suite, get_move_suite());
diff --git a/src/util/functions.c b/src/util/functions.c
index be5e069c1..bb24d0448 100644
--- a/src/util/functions.c
+++ b/src/util/functions.c
@@ -61,13 +61,3 @@ void register_function(pf_generic fun, const char *name)
   fl->name = strdup(name);
   functionlist = fl;
 }
-
-void list_registered_functions(void)
-{
-  function_list *fl = functionlist;
-
-  while (fl) {
-    printf("%s\n", fl->name);
-    fl = fl->next;
-  }
-}
diff --git a/src/util/functions.h b/src/util/functions.h
index 6ca496044..15bfca009 100644
--- a/src/util/functions.h
+++ b/src/util/functions.h
@@ -27,7 +27,6 @@ extern "C" {
   extern const char *get_functionname(pf_generic fun);
   extern pf_generic get_function(const char *name);
   extern void register_function(pf_generic fun, const char *name);
-  extern void list_registered_functions(void);
 
 #ifdef __cplusplus
 }
diff --git a/src/util/functions_test.c b/src/util/functions_test.c
new file mode 100644
index 000000000..c4c203385
--- /dev/null
+++ b/src/util/functions_test.c
@@ -0,0 +1,23 @@
+#include <cutest/CuTest.h>
+#include <stdio.h>
+#include <string.h>
+#include "functions.h"
+
+
+static void test_all(CuTest * tc)
+{
+  pf_generic fun;
+  
+  fun = get_function("herpderp");
+  CuAssertTrue(tc, !fun);
+  register_function((pf_generic)test_all, "herpderp");
+  fun = get_function("herpderp");
+  CuAssertTrue(tc, fun==(pf_generic)test_all);
+}
+
+CuSuite *get_functions_suite(void)
+{
+  CuSuite *suite = CuSuiteNew();
+  SUITE_ADD_TEST(suite, test_all);
+  return suite;
+}