diff --git a/test/database_test.rb b/test/database_test.rb
new file mode 100644
index 0000000..c54b65d
--- /dev/null
+++ b/test/database_test.rb
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/database_test_helper'
+
+TMPDIR = File.dirname(__FILE__) + '/tmp'
+FileUtils.rmtree TMPDIR
+FileUtils.mkdir  TMPDIR
+
+class DatabaseTest < Test::Unit::TestCase
+  include DatabaseTestHelper
+
+  def setup
+    @db = Bdb::Database.new('foo', :path => TMPDIR)
+    @db.truncate!
+  end
+  
+  def teardown
+    @db.close
+  end
+end
diff --git a/test/database_test_helper.rb b/test/database_test_helper.rb
new file mode 100644
index 0000000..8548d9b
--- /dev/null
+++ b/test/database_test_helper.rb
@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+module DatabaseTestHelper
+  def db
+    @db
+  end
+
+  def test_set_and_get
+    assert_equal nil, db['foo']
+    assert_equal [],  db.get('foo')
+
+    db.set('foo', [1,2,3])
+    assert_equal [1,2,3], db['foo']
+    assert_equal [[1,2,3]], db.get('foo')
+  end
+
+  def test_set_and_get_with_tuples
+    assert_equal [],  db.get(['foo', 1])
+    assert_equal [],  db.get(['foo', 2])
+
+    db.set(['foo', 1], [1,2,3])
+    assert_equal [[1,2,3]], db.get(['foo', 1])
+
+    db.set(['foo', 2], [3,4,5])
+    assert_equal [[3,4,5]], db.get(['foo', 2])
+
+    assert_equal [[1,2,3], [3,4,5]], db.get('foo', :partial => true)
+  end
+
+  def test_get_with_ranges
+    100.times do |i|
+      db.set([:foo, i], {:id => i, :type => 'foo'})
+    end
+
+    assert_equal (17..34).to_a, db.get([:foo, 17]..[:foo, 34]).collect {|r| r[:id]}
+  end
+end