diff --git a/src/main/clojure/cemerick/bandalore.clj b/src/main/clojure/cemerick/bandalore.clj
index 26d01c4..d97e9e4 100644
--- a/src/main/clojure/cemerick/bandalore.clj
+++ b/src/main/clojure/cemerick/bandalore.clj
@@ -52,7 +52,7 @@
 (defn list-queues
   "Returns a seq of all queues' URL strings.  Takes an optional string prefix
   argument to only list queues with names that start with the prefix."
-  [^AmazonSQSClient client &[prefix]]
+  [^AmazonSQSClient client & {:keys [prefix]}]
   (->> (ListQueuesRequest. prefix)
     (.listQueues client)
     .getQueueUrls
diff --git a/src/test/clojure/cemerick/bandalore_test.clj b/src/test/clojure/cemerick/bandalore_test.clj
index c6c3c29..b69338f 100644
--- a/src/test/clojure/cemerick/bandalore_test.clj
+++ b/src/test/clojure/cemerick/bandalore_test.clj
@@ -60,7 +60,7 @@
     (send client *test-queue-url* msg)
     (wait-for-condition #((set (list-queues client)) *test-queue-url*)
       "Created queue not visible in result of list-queues")
-    (wait-for-condition #((set (list-queues client test-queue-name-prefix)) *test-queue-url*)
+    (wait-for-condition #((set (list-queues client :prefix test-queue-name-prefix)) *test-queue-url*)
       "Created queue not visible in result of list-queues with prefix")))
 
 (defsqstest test-queue-attrs