diff --git a/testament/categories.nim b/testament/categories.nim
index 9f50a4705..43d39f227 100644
--- a/testament/categories.nim
+++ b/testament/categories.nim
@@ -478,7 +478,7 @@ proc makeSupTest(test, options: string, cat: Category): TTest =
   result.options = options
   result.startTime = epochTime()
 
-proc testNimblePackages(r: var TResults, cat: Category) =
+proc testNimblePackages(r: var TResults; cat: Category; packageFilter: string) =
   if nimbleExe == "":
     echo "[Warning] - Cannot run nimble tests: Nimble binary not found."
     return
@@ -491,6 +491,8 @@ proc testNimblePackages(r: var TResults, cat: Category) =
   var errors = 0
   try:
     for name, url, cmd, hasDep in listPackages():
+      if packageFilter notin name:
+        continue
       inc r.total
       var test = makeSupTest(url, "", cat)
       let buildPath = packagesDir / name
@@ -706,7 +708,7 @@ proc processCategory(r: var TResults, cat: Category,
     compileExample(r, "examples/gtk/*.nim", options, cat)
     compileExample(r, "examples/talk/*.nim", options, cat)
   of "nimble-packages":
-    testNimblePackages(r, cat)
+    testNimblePackages(r, cat, options)
   of "niminaction":
     testNimInAction(r, cat, options)
   of "untestable":
diff --git a/testament/testament.nim b/testament/testament.nim
index a437f18dd..a041d771f 100644
--- a/testament/testament.nim
+++ b/testament/testament.nim
@@ -717,7 +717,6 @@ proc main() =
   of "c", "cat", "category":
     skips = loadSkipFrom(skipFrom)
     var cat = Category(p.key)
-    p.next
     processCategory(r, cat, p.cmdLineRest.string, testsDir, runJoinableTests = true)
   of "pcat":
     skips = loadSkipFrom(skipFrom)