diff --git a/docs/user/general/datatypes.rst b/docs/user/general/datatypes.rst
index 614d6de9f9..5b6b0c0594 100644
--- a/docs/user/general/datatypes.rst
+++ b/docs/user/general/datatypes.rst
@@ -464,7 +464,7 @@ Geopoint Data Types
 
 A geopoint has a latitude and a longitude property. Although OpenSearch `supports multiple formats <https://opensearch.org/docs/2.3/opensearch/supported-field-types/geo-point/>`_, the SQL plugin currently only supports the format :code:`{"lat": number, "lon": number}`. The geopoint object can be queried or lat and lon can be specified using dot notation. For example, ::
 
-    os> SELECT geo_point_object, geo_point_object.lat, geo_point_object.lon FROM geo_point;
+    os> SELECT geo_point_object, geo_point_object.lat, geo_point_object.lon FROM geopoint;
     fetched rows / total rows = 1/1
     +-----------------------------+------------------------+------------------------+
     | geo_point_object            | geo_point_object.lat   | geo_point_object.lon   |
diff --git a/doctest/test_data/geopoint.json b/doctest/test_data/geopoint.json
new file mode 100644
index 0000000000..4ba2d27828
--- /dev/null
+++ b/doctest/test_data/geopoint.json
@@ -0,0 +1,6 @@
+{"index":{"_id":"1"}}
+{"geo_point_object": {"lat": 40.71, "lon": 74.00}, "object": {"geo_point_object": {"lat": 40.71, "lon": 74.00}}, "geo_point_string": "40.71, 74.00", "geo_point_geohash": "txhxegj0uyp3", "geo_point_array": [74.00, 40.71], "geo_point_string_point": "POINT (74.00 40.71)", "geo_point_geojson": {"type": "Point", "coordinates": [74.00, 40.71]}}
+{"index":{"_id":"2"}}
+{"geo_point_object": {"lat": -33.85253637358241, "lon": 151.21652352950258}, "object": {"geo_point_object": {"lat": -33.85253637358241, "lon": 151.21652352950258}},"geo_point_string": "-33.85356510743158, 151.22222172610114", "geo_point_geohash": "txhxegj0uyp3", "geo_point_array": [74.00, 40.71], "geo_point_string_point": "POINT (74.00 40.71)", "geo_point_geojson": {"type": "Point", "coordinates": [74.00, 40.71]}}
+{"index":{"_id":"3"}}
+{"geo_point_object": null, "object": {"geo_point_object": null},"geo_point_string": null, "geo_point_geohash": null, "geo_point_array": null, "geo_point_string_point": null, "geo_point_geojson": null}
diff --git a/doctest/test_docs.py b/doctest/test_docs.py
index 1fedbdf49e..eacee34652 100644
--- a/doctest/test_docs.py
+++ b/doctest/test_docs.py
@@ -28,6 +28,7 @@
 APACHE = "apache"
 WILDCARD = "wildcard"
 NESTED = "nested"
+GEOPOINT = "geopoint"
 DATASOURCES = ".ql-datasources"
 
 
@@ -97,6 +98,7 @@ def set_up_test_indices(test):
     load_file("apache.json", index_name=APACHE)
     load_file("wildcard.json", index_name=WILDCARD)
     load_file("nested_objects.json", index_name=NESTED)
+    load_file("geopoint.json", index_name=GEOPOINT)
     load_file("datasources.json", index_name=DATASOURCES)
 
 
diff --git a/doctest/test_mapping/geopoint.json b/doctest/test_mapping/geopoint.json
new file mode 100644
index 0000000000..8dc92fe5c4
--- /dev/null
+++ b/doctest/test_mapping/geopoint.json
@@ -0,0 +1,32 @@
+{
+  "mappings": {
+    "properties": {
+      "geo_point_object": {
+        "type": "geo_point"
+      },
+      "object": {
+        "type": "object",
+        "properties": {
+          "geo_point_object": {
+            "type": "geo_point"
+          }
+        }
+      },
+      "geo_point_string": {
+        "type": "geo_point"
+      },
+      "geo_point_geohash": {
+        "type": "geo_point"
+      },
+      "geo_point_array": {
+        "type": "geo_point"
+      },
+      "geo_point_string_point": {
+        "type": "geo_point"
+      },
+      "geo_point_geojson": {
+        "type": "geo_point"
+      }
+    }
+  }
+}