diff --git a/.gitignore b/.gitignore
index caeac6eb..ae5e64de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ janet.wasm
 # Generated files
 *.gen.h
 *.gen.c
+*.tmp
 
 # Generate test files
 *.out
diff --git a/examples/sample-bundle/bundle/info.jdn b/examples/sample-bundle/bundle/info.jdn
index 54875852..1ea8cbec 100644
--- a/examples/sample-bundle/bundle/info.jdn
+++ b/examples/sample-bundle/bundle/info.jdn
@@ -1,3 +1,3 @@
 @{
-  :dependencies ["spork"]
+  :dependencies ["sample-dep1" "sample-dep2"]
 }
diff --git a/examples/sample-bundle/mymod.janet b/examples/sample-bundle/mymod.janet
index 088ab194..8eb0c813 100644
--- a/examples/sample-bundle/mymod.janet
+++ b/examples/sample-bundle/mymod.janet
@@ -1,3 +1,7 @@
+(import dep1)
+(import dep2)
+
 (defn myfn
   [x]
-  (+ x x))
+  (def y (dep2/function x))
+  (dep1/function y))
diff --git a/examples/sample-dep1/bundle/info.jdn b/examples/sample-dep1/bundle/info.jdn
new file mode 100644
index 00000000..4db882df
--- /dev/null
+++ b/examples/sample-dep1/bundle/info.jdn
@@ -0,0 +1,3 @@
+@{
+  :dependencies ["sample-dep2"]
+}
diff --git a/examples/sample-dep1/bundle/init.janet b/examples/sample-dep1/bundle/init.janet
new file mode 100644
index 00000000..3441e07d
--- /dev/null
+++ b/examples/sample-dep1/bundle/init.janet
@@ -0,0 +1,3 @@
+(defn install
+  [manifest &]
+  (bundle/add-file manifest "dep1.janet"))
diff --git a/examples/sample-dep1/dep1.janet b/examples/sample-dep1/dep1.janet
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/sample-dep2/bundle/info.jdn b/examples/sample-dep2/bundle/info.jdn
new file mode 100644
index 00000000..7270cf99
--- /dev/null
+++ b/examples/sample-dep2/bundle/info.jdn
@@ -0,0 +1 @@
+@{}
diff --git a/examples/sample-dep2/bundle/init.janet b/examples/sample-dep2/bundle/init.janet
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/sample-dep2/dep2.janet b/examples/sample-dep2/dep2.janet
new file mode 100644
index 00000000..9649f7b9
--- /dev/null
+++ b/examples/sample-dep2/dep2.janet
@@ -0,0 +1,3 @@
+(defn function
+  [x]
+  (* x x))
diff --git a/test/suite-bundle.janet b/test/suite-bundle.janet
new file mode 100644
index 00000000..319d78e9
--- /dev/null
+++ b/test/suite-bundle.janet
@@ -0,0 +1,103 @@
+# Copyright (c) 2024 Calvin Rose
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+(import ./helper :prefix "" :exit true)
+(start-suite)
+
+(assert true) # smoke test
+
+# Copy since not exposed in boot.janet
+(defn- rmrf
+  "rm -rf in janet"
+  [x]
+  (case (os/stat x :mode)
+    :file (os/rm x)
+    :directory (do
+                 (each y (os/dir x) (rmrf (string x "/" y)))
+                 (os/rmdir x)))
+  nil)
+
+# Setup a temporary syspath for manipultation
+(def syspath (string "./" (gensym) "_jpm_tree.tmp"))
+(os/mkdir syspath)
+(setdyn *syspath* (os/realpath syspath))
+(setdyn *out* @"")
+(assert (empty? (bundle/list)) "initial bundle/list")
+(assert (empty? (bundle/topolist)) "initial bundle/topolist")
+
+# Try (and fail) to install sample-bundle (missing deps)
+(assert-error "missing dependencies sample-dep1, sample-dep2"
+              (bundle/install "./examples/sample-bundle" "sample-bundle"))
+
+# Install deps (dep1 as :auto-remove)
+(assert-no-error "sample-dep2" 
+                 (print (dyn *syspath*))
+                 (bundle/install "./examples/sample-dep2"))
+(assert-no-error "sample-dep1" (bundle/install "./examples/sample-dep1"))
+(assert-no-error "sample-dep2 reinstall" (bundle/reinstall "sample-dep2"))
+(assert-no-error "sample-dep1 reinstall" (bundle/reinstall "sample-dep1" :auto-remove true))
+
+(assert (= 2 (length (bundle/list))) "bundles are listed correctly 1")
+(assert (= 2 (length (bundle/topolist))) "bundles are listed correctly 2")
+
+# Now install sample-bundle
+(assert-no-error "sample-bundle install" (bundle/install "./examples/sample-bundle"))
+
+(assert (= 3 (length (bundle/list))) "bundles are listed correctly 3")
+(assert (= 3 (length (bundle/topolist))) "bundles are listed correctly 4")
+
+# Check topolist has not bad order
+(def tlist (bundle/topolist))
+(assert (> (index-of "sample-bundle" tlist) (index-of "sample-dep2" tlist)) "topolist 1")
+(assert (> (index-of "sample-bundle" tlist) (index-of "sample-dep1" tlist)) "topolist 2")
+(assert (> (index-of "sample-dep1" tlist) (index-of "sample-dep2" tlist)) "topolist 3")
+
+# Prune should do nothing
+(assert-no-error "first prune" (bundle/prune))
+(assert (= 3 (length (bundle/list))) "bundles are listed correctly 3")
+(assert (= 3 (length (bundle/topolist))) "bundles are listed correctly 4")
+
+# Manual uninstall of dep1 and dep2 shouldn't work either since that would break dependencies
+(assert-error "cannot uninstall sample-dep1, breaks dependent bundles @[\"sample-bundle\"]"
+              (bundle/uninstall "sample-dep1"))
+
+# Now re-install sample-bundle as auto-remove
+(assert-no-error "sample-bundle install" (bundle/reinstall "sample-bundle" :auto-remove true))
+
+# Reinstallation should also work without being concerned about breaking dependencies
+(assert-no-error "reinstall dep" (bundle/reinstall "sample-dep2"))
+
+# Now prune should get rid of everything except sample-dep2
+(assert-no-error "second prune" (bundle/prune))
+
+# Now check that we exactly one package left, which is dep2
+(assert (= 1 (length (bundle/list))) "bundles are listed correctly 5")
+(assert (= 1 (length (bundle/topolist))) "bundles are listed correctly 6")
+
+# Which we can uninstall manually
+(assert-no-error "uninstall dep2" (bundle/uninstall "sample-dep2"))
+
+# Now check bundle listing is again empty
+(assert (= 0 (length (bundle/list))) "bundles are listed correctly 7")
+(assert (= 0 (length (bundle/topolist))) "bundles are listed correctly 8")
+
+(rmrf syspath)
+
+(end-suite)