diff --git a/tests/test-dirs/occurrences/issue1410.t b/tests/test-dirs/occurrences/issue1410.t
index 14948be952..65e4e27ad5 100644
--- a/tests/test-dirs/occurrences/issue1410.t
+++ b/tests/test-dirs/occurrences/issue1410.t
@@ -1,11 +1,22 @@
-FIXME: No result is returned, we could expect the one occurrence of None.
+No result is returned, we could expect the one occurrence of None.
   $ $MERLIN single occurrences -identifier-at 3:3 -filename opt.ml <<EOF | \
   > jq '.value'
   > (* test case *)
   > let f ?(x=1) () = 2 ;;
   > None
   > EOF
-  []
+  [
+    {
+      "start": {
+        "line": 3,
+        "col": 0
+      },
+      "end": {
+        "line": 3,
+        "col": 4
+      }
+    }
+  ]
 
   $ $MERLIN single occurrences -identifier-at 3:3 -filename opt.ml <<EOF | \
   > jq '.value'
@@ -13,4 +24,15 @@ FIXME: No result is returned, we could expect the one occurrence of None.
   > let f () = 2 ;;
   > None
   > EOF
-  []
+  [
+    {
+      "start": {
+        "line": 3,
+        "col": 0
+      },
+      "end": {
+        "line": 3,
+        "col": 4
+      }
+    }
+  ]
diff --git a/tests/test-dirs/occurrences/no-ml.t b/tests/test-dirs/occurrences/no-ml.t
new file mode 100644
index 0000000000..f133ca2ea0
--- /dev/null
+++ b/tests/test-dirs/occurrences/no-ml.t
@@ -0,0 +1,54 @@
+  $ cat >oui_ml.ml <<'EOF'
+  > type t = int
+  > EOF
+
+  $ cat >no_ml.mli <<'EOF'
+  > include module type of Oui_ml
+  > EOF
+
+  $ cat >main.ml <<'EOF'
+  > let (x : No_ml.t) = 42
+  > open No_ml
+  > let (y : t) = 43
+  > EOF
+
+  $ $OCAMLC -bin-annot -c oui_ml.ml no_ml.mli
+
+  $ $MERLIN single occurrences -scope project -identifier-at 1:15 \
+  > -filename main.ml <main.ml | jq '.value'
+  [
+    {
+      "file": "$TESTCASE_ROOT/main.ml",
+      "start": {
+        "line": 1,
+        "col": 15
+      },
+      "end": {
+        "line": 1,
+        "col": 16
+      }
+    },
+    {
+      "file": "$TESTCASE_ROOT/main.ml",
+      "start": {
+        "line": 3,
+        "col": 9
+      },
+      "end": {
+        "line": 3,
+        "col": 10
+      }
+    }
+  ]
+
+
+
+  $ $MERLIN single locate -look-for ml -position 1:15 \
+  > -filename main.ml <main.ml | jq '.value'
+  {
+    "file": "$TESTCASE_ROOT/oui_ml.ml",
+    "pos": {
+      "line": 1,
+      "col": 5
+    }
+  }
diff --git a/tests/test-dirs/occurrences/only-local.t b/tests/test-dirs/occurrences/only-local.t
new file mode 100644
index 0000000000..1beae3d3af
--- /dev/null
+++ b/tests/test-dirs/occurrences/only-local.t
@@ -0,0 +1,146 @@
+Some occurrences are only available locally an dnot part of the global index
+
+  $ cat >local.ml <<'EOF'
+  > type t = int
+  > let x : int = 42
+  > EOF
+
+Predef:
+  $ $MERLIN single occurrences -identifier-at 2:9 \
+  > -filename local.ml <local.ml | jq '.value'
+  [
+    {
+      "start": {
+        "line": 1,
+        "col": 9
+      },
+      "end": {
+        "line": 1,
+        "col": 12
+      }
+    },
+    {
+      "start": {
+        "line": 2,
+        "col": 8
+      },
+      "end": {
+        "line": 2,
+        "col": 11
+      }
+    }
+  ]
+
+
+Predef constructors:
+  $ cat >local.ml <<'EOF'
+  > let _ = None
+  > let None = None
+  > EOF
+
+  $ $MERLIN single occurrences -identifier-at 1:10 \
+  > -filename local.ml <local.ml | jq '.value'
+  [
+    {
+      "start": {
+        "line": 1,
+        "col": 8
+      },
+      "end": {
+        "line": 1,
+        "col": 12
+      }
+    },
+    {
+      "start": {
+        "line": 2,
+        "col": 4
+      },
+      "end": {
+        "line": 2,
+        "col": 8
+      }
+    },
+    {
+      "start": {
+        "line": 2,
+        "col": 11
+      },
+      "end": {
+        "line": 2,
+        "col": 15
+      }
+    }
+  ]
+
+true / false
+  $ cat >local.ml <<'EOF'
+  > let _ = true
+  > let _ = true
+  > EOF
+
+  $ $MERLIN single occurrences -identifier-at 1:10 \
+  > -filename local.ml <local.ml | jq '.value'
+  [
+    {
+      "start": {
+        "line": 1,
+        "col": 8
+      },
+      "end": {
+        "line": 1,
+        "col": 12
+      }
+    },
+    {
+      "start": {
+        "line": 2,
+        "col": 8
+      },
+      "end": {
+        "line": 2,
+        "col": 12
+      }
+    }
+  ]
+
+unit
+  $ cat >local.ml <<'EOF'
+  > let _ = ()
+  > let f () = ()
+  > EOF
+
+  $ $MERLIN single occurrences -identifier-at 1:9 \
+  > -filename local.ml <local.ml | jq '.value'
+  [
+    {
+      "start": {
+        "line": 1,
+        "col": 8
+      },
+      "end": {
+        "line": 1,
+        "col": 10
+      }
+    },
+    {
+      "start": {
+        "line": 2,
+        "col": 6
+      },
+      "end": {
+        "line": 2,
+        "col": 8
+      }
+    },
+    {
+      "start": {
+        "line": 2,
+        "col": 11
+      },
+      "end": {
+        "line": 2,
+        "col": 13
+      }
+    }
+  ]