diff --git a/simpletest/WalkTest.php b/simpletest/WalkTest.php
new file mode 100644
index 0000000..2cb36d3
--- /dev/null
+++ b/simpletest/WalkTest.php
@@ -0,0 +1,24 @@
+<?php
+
+class WalkTest extends SimpleTest {
+  function test_1_walk() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts");
+
+    $results = array();
+    while ($row = $Walk->next()) {
+      $results[] = $row;
+    }
+
+    $this->assert(count($results) == 8);
+    $this->assert($results[7]['username'] == 'vookoo');
+  }
+
+  function test_2_walk_stop() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts");
+    $Walk->next();
+    unset($Walk);
+
+    // if $Walk hasn't been properly freed, this will produce an out of sync error
+    DB::query("SELECT * FROM accounts");
+  }
+}
\ No newline at end of file
diff --git a/simpletest/test.php b/simpletest/test.php
index 3ad0f07..34ec038 100755
--- a/simpletest/test.php
+++ b/simpletest/test.php
@@ -31,6 +31,7 @@ DB::$host = $set_host;
 DB::get(); //connect to mysql
 
 require_once __DIR__ . '/BasicTest.php';
+require_once __DIR__ . '/WalkTest.php';
 require_once __DIR__ . '/CallTest.php';
 require_once __DIR__ . '/ObjectTest.php';
 require_once __DIR__ . '/WhereClauseTest.php';
@@ -40,6 +41,7 @@ require_once __DIR__ . '/HelperTest.php';
 
 $classes_to_test = array(
   'BasicTest',
+  'WalkTest',
   'CallTest',
   'WhereClauseTest',
   'ObjectTest',