diff --git a/Makefile b/Makefile
index b57caf3..bd4b914 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ LDFLAGS ?= -g -O1
 LIB_CFLAGS ?= -fpic
 LIB_LDFLAGS ?= -shared
 GARGOYLE_OBJS := delusion gargoyle scribe sleuth twine
-GARGOYLE_TEST_OBJS := runner scribe sleuth twine
+GARGOYLE_TEST_OBJS := runner gargoyle scribe sleuth twine
 #GARGOYLE_TEST_OBJS := runner $(GARGOYLE_OBJS)
 
 .PHONY: all gargoyle init docs test clean
diff --git a/test/runner.c b/test/runner.c
index 8040068..d4b4202 100644
--- a/test/runner.c
+++ b/test/runner.c
@@ -1,5 +1,6 @@
 #include <CUnit/Basic.h>
 #include <CUnit/TestDB.h>
+#include <gargoyle/test/gargoyle.h>
 #include <gargoyle/test/scribe.h>
 #include <gargoyle/test/sleuth.h>
 #include <gargoyle/test/twine.h>
@@ -9,6 +10,12 @@ int main() {
     return CU_get_error();
   }
 
+  CU_TestInfo gargoyle_tests[] = {
+    { "gargoyle_digest_argv", gargoyle_test_digest_argv },
+    { "gargoyle_digest_envh", gargoyle_test_digest_envh },
+    CU_TEST_INFO_NULL
+  };
+
   CU_TestInfo scribe_tests[] = {
     { "gargoyle_from_bool", scribe_test_from_bool },
     { "gargoyle_from_rope", scribe_test_from_rope },
@@ -31,7 +38,7 @@ int main() {
 
   CU_SuiteInfo suites[] = {
 //    { "delusion", init_suite_delusion, clean_suite_delusion, NULL, NULL, delusion_tests },
-//    { "gargoyle", init_suite_gargoyle, clean_suite_gargoyle, NULL, NULL, gargoyle_tests },
+    { "gargoyle", init_suite_gargoyle, clean_suite_gargoyle, NULL, NULL, gargoyle_tests },
     { "scribe", init_suite_scribe, clean_suite_scribe, NULL, NULL, scribe_tests },
     { "sleuth", init_suite_sleuth, clean_suite_sleuth, NULL, NULL, sleuth_tests },
     { "twine", init_suite_twine, clean_suite_twine, NULL, NULL, twine_tests },