diff --git a/test/unit/map/query_map_point.cpp b/test/unit/map/query_map_point.cpp
new file mode 100644
index 000000000..982f3ac48
--- /dev/null
+++ b/test/unit/map/query_map_point.cpp
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2021 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include "catch.hpp"
+
+#include <mapnik/map.hpp>
+#include <mapnik/feature.hpp>
+#include <mapnik/featureset.hpp>
+#include <mapnik/load_map.hpp>
+
+TEST_CASE("Query map point") {
+
+SECTION("Polygons") {
+
+    mapnik::Map map(882,780);
+    mapnik::load_map(map, "./test/data/good_maps/wgs842merc_reprojection.xml");
+    map.zoom_all();
+
+    {
+        auto featureset = map.query_map_point(0u, 351, 94);
+        while (auto feature = featureset->next())
+        {
+            auto val = feature->get("ADMIN");
+            CHECK(val.to_string() == "Greenland");
+        }
+
+    }
+    {
+        auto featureset = map.query_map_point(0u, 402, 182);
+        while (auto feature = featureset->next())
+        {
+            auto val = feature->get("ADMIN");
+            CHECK(val.to_string() == "Iceland");
+        }
+    }
+    {
+        auto featureset = map.query_map_point(0u, 339, 687);
+        while (auto feature = featureset->next())
+        {
+            auto val = feature->get("ADMIN");
+            CHECK(val.to_string() == "Antarctica");
+        }
+
+    }
+
+    {
+        auto featureset = map.query_map_point(0u, 35, 141);
+        while (auto feature = featureset->next())
+        {
+            auto val = feature->get("ADMIN");
+            CHECK(val.to_string() == "Russia");
+        }
+    }
+    {
+        auto featureset = map.query_map_point(0u, 737, 297);
+        while (auto feature = featureset->next())
+        {
+            auto val = feature->get("ADMIN");
+            CHECK(val.to_string() == "Japan");
+        }
+    }
+}
+}