diff --git a/src/Resolver/Resolver.php b/src/Resolver/Resolver.php
index 6108b3da..dc721582 100644
--- a/src/Resolver/Resolver.php
+++ b/src/Resolver/Resolver.php
@@ -28,6 +28,7 @@ public function resolve($domain)
 
     public function resolveAll($domain, $type)
     {
+        $domain = trim($domain, '.');
         $query = new Query($domain, $type, Message::CLASS_IN);
 
         return $this->executor->query(
diff --git a/tests/FunctionalResolverTest.php b/tests/FunctionalResolverTest.php
index 25900cc0..35781962 100644
--- a/tests/FunctionalResolverTest.php
+++ b/tests/FunctionalResolverTest.php
@@ -48,6 +48,17 @@ public function testResolveGoogleResolves()
         Loop::run();
     }
 
+    /**
+     * @group internet
+     */
+    public function testResolveGoogleFQDNResolves()
+    {
+        $promise = $this->resolver->resolve('google.com.');
+        $promise->then($this->expectCallableOnce(), $this->expectCallableNever());
+
+        Loop::run();
+    }
+
     /**
      * @group internet
      */