diff --git a/spec/oga/xpath/evaluator/axes/descendant_or_self_spec.rb b/spec/oga/xpath/evaluator/axes/descendant_or_self_spec.rb
new file mode 100644
index 0000000..8ef745e
--- /dev/null
+++ b/spec/oga/xpath/evaluator/axes/descendant_or_self_spec.rb
@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe Oga::XPath::Evaluator do
+  context 'descendant-or-self axis' do
+    before do
+      document = parse('<a><b><b><c></c></b></b></a>')
+
+      @first_a   = document.children[0]
+      @first_b   = @first_a.children[0]
+      @second_b  = @first_b.children[0]
+      @first_c   = @second_b.children[0]
+      @evaluator = described_class.new(document)
+    end
+
+    context 'direct descendants' do
+      before do
+        @set = @evaluator.evaluate('descendant-or-self::b')
+      end
+
+      it_behaves_like :node_set, :length => 2
+
+      example 'return the first <b> node' do
+        @set[0].should == @first_b
+      end
+
+      example 'return the second <b> node' do
+        @set[1].should == @second_b
+      end
+    end
+
+    context 'nested descendants' do
+      before do
+        @set = @evaluator.evaluate('descendant-or-self::c')
+      end
+
+      it_behaves_like :node_set, :length => 1
+
+      example 'return the <c> node' do
+        @set[0].should == @first_c
+      end
+    end
+
+    context 'descendants of a specific node' do
+      before do
+        @set = @evaluator.evaluate('a/descendant-or-self::b')
+      end
+
+      it_behaves_like :node_set, :length => 2
+
+      example 'return the first <b> node' do
+        @set[0].should == @first_b
+      end
+
+      example 'return the second <b> node' do
+        @set[1].should == @second_b
+      end
+    end
+
+    context 'descendants matching self' do
+      before do
+        @set = @evaluator.evaluate('descendant-or-self::a')
+      end
+
+      it_behaves_like :node_set, :length => 1
+
+      example 'return the first <a> node' do
+        @set[0].should == @first_a
+      end
+    end
+
+    context 'descendants of a specific node matching self' do
+      before do
+        @set = @evaluator.evaluate('a/b/b/c/descendant-or-self::c')
+      end
+
+      it_behaves_like :node_set, :length => 1
+
+      example 'return the first <c> node' do
+        @set[0].should == @first_c
+      end
+    end
+
+    context 'non existing descendants' do
+      before do
+        @set = @evaluator.evaluate('descendant-or-self::foobar')
+      end
+
+      it_behaves_like :empty_node_set
+    end
+  end
+end
diff --git a/spec/oga/xpath/evaluator/axes/descendant_spec.rb b/spec/oga/xpath/evaluator/axes/descendant_spec.rb
index bb026d0..85ac9ef 100644
--- a/spec/oga/xpath/evaluator/axes/descendant_spec.rb
+++ b/spec/oga/xpath/evaluator/axes/descendant_spec.rb
@@ -52,7 +52,8 @@ describe Oga::XPath::Evaluator do
 
     context 'non existing descendants' do
       before do
-        @set = @evaluator.evaluate('descendant::foobar')
+        # This should result in an empty set since <c> has no <c> children.
+        @set = @evaluator.evaluate('a/b/c/descendant::c')
       end
 
       it_behaves_like :empty_node_set