diff --git a/fnl/conjure-spec/client/fennel/aniseed_spec.fnl b/fnl/conjure-spec/client/fennel/aniseed_spec.fnl
index afe0a3a2..bb5a6153 100644
--- a/fnl/conjure-spec/client/fennel/aniseed_spec.fnl
+++ b/fnl/conjure-spec/client/fennel/aniseed_spec.fnl
@@ -1,6 +1,6 @@
 (local {: describe : it} (require :plenary.busted))
 (local assert (require :luassert.assert))
-(local a (require :nfnl.core))
+(local a (require :conjure.nfnl.core))
 (local ani (require :conjure.client.fennel.aniseed))
 
 (describe "conjure.client.fennel.aniseed"
diff --git a/fnl/conjure-spec/client/fennel/nfnl_spec.fnl b/fnl/conjure-spec/client/fennel/nfnl_spec.fnl
index d49c319f..69e4795f 100644
--- a/fnl/conjure-spec/client/fennel/nfnl_spec.fnl
+++ b/fnl/conjure-spec/client/fennel/nfnl_spec.fnl
@@ -1,6 +1,6 @@
 (local {: describe : it} (require :plenary.busted))
 (local assert (require :luassert.assert))
-(local fs (require :nfnl.fs))
+(local fs (require :conjure.nfnl.fs))
 (local nfnlc (require :conjure.client.fennel.nfnl))
 
 (describe "conjure.client.fennel.nfnl"
diff --git a/fnl/conjure-spec/client_spec.fnl b/fnl/conjure-spec/client_spec.fnl
index 400dc649..43070200 100644
--- a/fnl/conjure-spec/client_spec.fnl
+++ b/fnl/conjure-spec/client_spec.fnl
@@ -1,6 +1,6 @@
 (local {: describe : it : before-each } (require :plenary.busted))
 (local assert (require :luassert.assert))
-(local nc (require :nfnl.core))
+(local nc (require :conjure.nfnl.core))
 (local client (require :conjure.client))
 
 (describe "multiple-states? before a change"
diff --git a/fnl/conjure-spec/config_spec.fnl b/fnl/conjure-spec/config_spec.fnl
index fbeaedfa..15658dd2 100644
--- a/fnl/conjure-spec/config_spec.fnl
+++ b/fnl/conjure-spec/config_spec.fnl
@@ -1,7 +1,7 @@
 (local {: describe : it } (require :plenary.busted))
 (local assert (require :luassert.assert))
 (local config (require :conjure.config))
-(local core (require :nfnl.core))
+(local core (require :conjure.nfnl.core))
 
 (describe "get-in"
   (fn []
diff --git a/fnl/conjure-spec/remote/transport/bencode_spec.fnl b/fnl/conjure-spec/remote/transport/bencode_spec.fnl
index e71a42cf..7906671d 100644
--- a/fnl/conjure-spec/remote/transport/bencode_spec.fnl
+++ b/fnl/conjure-spec/remote/transport/bencode_spec.fnl
@@ -1,6 +1,5 @@
 (local {: describe : it} (require :plenary.busted))
 (local assert (require :luassert.assert))
-(local a (require :nfnl.core))
 (local bencode (require :conjure.remote.transport.bencode))
 
 (describe "conjure.remote.transport.bencode"
diff --git a/fnl/conjure-spec/uuid_spec.fnl b/fnl/conjure-spec/uuid_spec.fnl
index ac1c4ccd..5a4ca2a9 100644
--- a/fnl/conjure-spec/uuid_spec.fnl
+++ b/fnl/conjure-spec/uuid_spec.fnl
@@ -1,6 +1,6 @@
 (local {: describe : it} (require :plenary.busted))
 (local assert (require :luassert.assert))
-(local a (require :nfnl.core))
+(local a (require :conjure.nfnl.core))
 (local uuid (require :conjure.uuid))
 
 (describe "uuid"
diff --git a/lua/conjure-spec/client/fennel/aniseed_spec.lua b/lua/conjure-spec/client/fennel/aniseed_spec.lua
index 9b4607e7..9cd36212 100644
--- a/lua/conjure-spec/client/fennel/aniseed_spec.lua
+++ b/lua/conjure-spec/client/fennel/aniseed_spec.lua
@@ -3,7 +3,7 @@ local _local_1_ = require("plenary.busted")
 local describe = _local_1_["describe"]
 local it = _local_1_["it"]
 local assert = require("luassert.assert")
-local a = require("nfnl.core")
+local a = require("conjure.nfnl.core")
 local ani = require("conjure.client.fennel.aniseed")
 local function _2_()
   local ex_mod = "test.foo.bar"
diff --git a/lua/conjure-spec/client/fennel/nfnl_spec.lua b/lua/conjure-spec/client/fennel/nfnl_spec.lua
index db00f35e..2f995230 100644
--- a/lua/conjure-spec/client/fennel/nfnl_spec.lua
+++ b/lua/conjure-spec/client/fennel/nfnl_spec.lua
@@ -3,7 +3,7 @@ local _local_1_ = require("plenary.busted")
 local describe = _local_1_["describe"]
 local it = _local_1_["it"]
 local assert = require("luassert.assert")
-local fs = require("nfnl.fs")
+local fs = require("conjure.nfnl.fs")
 local nfnlc = require("conjure.client.fennel.nfnl")
 local function _2_()
   local function _3_()
diff --git a/lua/conjure-spec/client_spec.lua b/lua/conjure-spec/client_spec.lua
index c7ae6b12..b14f1326 100644
--- a/lua/conjure-spec/client_spec.lua
+++ b/lua/conjure-spec/client_spec.lua
@@ -4,7 +4,7 @@ local describe = _local_1_["describe"]
 local it = _local_1_["it"]
 local before_each = _local_1_["before-each"]
 local assert = require("luassert.assert")
-local nc = require("nfnl.core")
+local nc = require("conjure.nfnl.core")
 local client = require("conjure.client")
 local function _2_()
   local function _3_()
diff --git a/lua/conjure-spec/config_spec.lua b/lua/conjure-spec/config_spec.lua
index 0c3b5570..fe5c27d7 100644
--- a/lua/conjure-spec/config_spec.lua
+++ b/lua/conjure-spec/config_spec.lua
@@ -4,7 +4,7 @@ local describe = _local_1_["describe"]
 local it = _local_1_["it"]
 local assert = require("luassert.assert")
 local config = require("conjure.config")
-local core = require("nfnl.core")
+local core = require("conjure.nfnl.core")
 local function _2_()
   local function _3_()
     assert.is_true(config["get-in"]({"client_on_load"}))
diff --git a/lua/conjure-spec/remote/transport/bencode_spec.lua b/lua/conjure-spec/remote/transport/bencode_spec.lua
index eb288575..56f4c5e7 100644
--- a/lua/conjure-spec/remote/transport/bencode_spec.lua
+++ b/lua/conjure-spec/remote/transport/bencode_spec.lua
@@ -3,7 +3,6 @@ local _local_1_ = require("plenary.busted")
 local describe = _local_1_["describe"]
 local it = _local_1_["it"]
 local assert = require("luassert.assert")
-local a = require("nfnl.core")
 local bencode = require("conjure.remote.transport.bencode")
 local function _2_()
   local function _3_()
diff --git a/lua/conjure-spec/uuid_spec.lua b/lua/conjure-spec/uuid_spec.lua
index c1f34879..086a8075 100644
--- a/lua/conjure-spec/uuid_spec.lua
+++ b/lua/conjure-spec/uuid_spec.lua
@@ -3,7 +3,7 @@ local _local_1_ = require("plenary.busted")
 local describe = _local_1_["describe"]
 local it = _local_1_["it"]
 local assert = require("luassert.assert")
-local a = require("nfnl.core")
+local a = require("conjure.nfnl.core")
 local uuid = require("conjure.uuid")
 local function _2_()
   local function is_in(word, xs)
diff --git a/scripts/setup-test-deps b/scripts/setup-test-deps
index 37bc882a..73b9a43d 100755
--- a/scripts/setup-test-deps
+++ b/scripts/setup-test-deps
@@ -22,6 +22,12 @@ else
 	git clone https://github.com/Olical/aniseed.git "$PACK_DIR/aniseed"
 fi
 
+if [ -d "$PACK_DIR/nfnl" ]; then
+	echo "nfnl already exists"
+else
+	git clone https://github.com/Olical/nfnl.git "$PACK_DIR/nfnl"
+fi
+
 if [ -d "$PACK_DIR/conjure" ]; then
 	echo "conjure (symlink) already exists"
 else