diff --git a/rebar.config b/rebar.config
index 46ae791..e2e8465 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,16 +1,11 @@
-{erl_opts, [debug_info, {src_dirs, ["test/unit",
-                                    "test/integration",
-                                    "test/system"]}]}.
+{erl_opts, [debug_info, {src_dirs, ["test"]}]}.
 {lfe_first_files, []}.
 {deps_dir, ["deps"]}.
 {eunit_compile_opts, [
-   {src_dirs, ["test/unit",
-               "test/integration",
-               "test/system",
-               "src"]}
+   {src_dirs, ["test"]}
   ]}.
 {deps, [
    {lfe, ".*", {git, "git://github.com/rvirding/lfe.git", "develop"}},
-   {'lfe-utils', ".*", {git, "https://github.com/lfe/lfe-utils.git", "master"}},
-   {lfeunit, ".*", {git, "git://github.com/lfe/lfeunit.git", "master"}}
+   {lutil, ".*", {git, "https://github.com/lfex/lutil.git", "master"}},
+   {ltest, ".*", {git, "git://github.com/lfex/ltest.git", "master"}}
   ]}.
diff --git a/test/unit/unit-calrissian-error-monad-tests.lfe b/test/unit-calrissian-error-monad-tests.lfe
similarity index 74%
rename from test/unit/unit-calrissian-error-monad-tests.lfe
rename to test/unit-calrissian-error-monad-tests.lfe
index 37003aa..d6125ed 100644
--- a/test/unit/unit-calrissian-error-monad-tests.lfe
+++ b/test/unit-calrissian-error-monad-tests.lfe
@@ -1,13 +1,10 @@
 (defmodule unit-calrissian-error-monad-tests
-  (export all)
-  (import
-    (from lfeunit-util
-      (check-failed-assert 2)
-      (check-wrong-assert-exception 2))))
+  (behaviour ltest-unit)
+  (export all))
 
-(include-lib "deps/lfeunit/include/lfeunit-macros.lfe")
-(include-lib "include/monads.lfe")
-(include-lib "include/monad-tests.lfe")
+(include-lib "ltest/include/ltest-macros.lfe")
+(include-lib "calrissian/include/monads.lfe")
+(include-lib "calrissian/include/monad-tests.lfe")
 
 (test-monad (monad 'error))
 
diff --git a/test/unit/unit-calrissian-identity-monad-tests.lfe b/test/unit-calrissian-identity-monad-tests.lfe
similarity index 50%
rename from test/unit/unit-calrissian-identity-monad-tests.lfe
rename to test/unit-calrissian-identity-monad-tests.lfe
index ea8ccac..87e15a9 100644
--- a/test/unit/unit-calrissian-identity-monad-tests.lfe
+++ b/test/unit-calrissian-identity-monad-tests.lfe
@@ -1,13 +1,10 @@
 (defmodule unit-calrissian-identity-monad-tests
-  (export all)
-  (import
-    (from lfeunit-util
-      (check-failed-assert 2)
-      (check-wrong-assert-exception 2))))
+  (behaviour ltest-unit)
+  (export all))
 
-(include-lib "deps/lfeunit/include/lfeunit-macros.lfe")
-(include-lib "include/monads.lfe")
-(include-lib "include/monad-tests.lfe")
+(include-lib "ltest/include/ltest-macros.lfe")
+(include-lib "calrissian/include/monads.lfe")
+(include-lib "calrissian/include/monad-tests.lfe")
 
 (test-monad (monad 'identity))
 
diff --git a/test/unit/unit-calrissian-maybe-monad-tests.lfe b/test/unit-calrissian-maybe-monad-tests.lfe
similarity index 75%
rename from test/unit/unit-calrissian-maybe-monad-tests.lfe
rename to test/unit-calrissian-maybe-monad-tests.lfe
index e463b49..16de31c 100644
--- a/test/unit/unit-calrissian-maybe-monad-tests.lfe
+++ b/test/unit-calrissian-maybe-monad-tests.lfe
@@ -1,13 +1,10 @@
 (defmodule unit-calrissian-maybe-monad-tests
-  (export all)
-  (import
-    (from lfeunit-util
-      (check-failed-assert 2)
-      (check-wrong-assert-exception 2))))
+  (behaviour ltest-unit)
+  (export all))
 
-(include-lib "deps/lfeunit/include/lfeunit-macros.lfe")
-(include-lib "include/monads.lfe")
-(include-lib "include/monad-tests.lfe")
+(include-lib "ltest/include/ltest-macros.lfe")
+(include-lib "calrissian/include/monads.lfe")
+(include-lib "calrissian/include/monad-tests.lfe")
 
 (test-monad (monad 'maybe))
 
diff --git a/test/unit/unit-calrissian-state-transformer-tests.lfe b/test/unit-calrissian-state-transformer-tests.lfe
similarity index 86%
rename from test/unit/unit-calrissian-state-transformer-tests.lfe
rename to test/unit-calrissian-state-transformer-tests.lfe
index 99e1c8a..02f1718 100644
--- a/test/unit/unit-calrissian-state-transformer-tests.lfe
+++ b/test/unit-calrissian-state-transformer-tests.lfe
@@ -1,13 +1,10 @@
 (defmodule unit-calrissian-state-transformer-tests
-  (export all)
-  (import
-    (from lfeunit-util
-      (check-failed-assert 2)
-      (check-wrong-assert-exception 2))))
+  (behaviour ltest-unit)
+  (export all))
 
-(include-lib "deps/lfeunit/include/lfeunit-macros.lfe")
-(include-lib "include/monads.lfe")
-(include-lib "include/monad-tests.lfe")
+(include-lib "ltest/include/ltest-macros.lfe")
+(include-lib "calrissian/include/monads.lfe")
+(include-lib "calrissian/include/monad-tests.lfe")
 
 (test-monad (transformer 'state 'identity))