diff --git a/compiler/tools/fpp-locate-uses/test/defs.fpp b/compiler/tools/fpp-locate-uses/test/defs.fpp
index ef59aa0d2..0209c1ab2 100644
--- a/compiler/tools/fpp-locate-uses/test/defs.fpp
+++ b/compiler/tools/fpp-locate-uses/test/defs.fpp
@@ -83,3 +83,8 @@ constant record_id = 0
 constant container_id = 0
 constant container_priority = 0
 constant product_recv_priority = 0
+
+type ActionType
+type GuardType
+type SignalType
+constant SignalConstant = 10
diff --git a/compiler/tools/fpp-locate-uses/test/stdin.ref.txt b/compiler/tools/fpp-locate-uses/test/stdin.ref.txt
index 2451bd406..149dfcb35 100644
--- a/compiler/tools/fpp-locate-uses/test/stdin.ref.txt
+++ b/compiler/tools/fpp-locate-uses/test/stdin.ref.txt
@@ -2,6 +2,7 @@ locate component C1 at "defs.fpp"
 locate component M.C1 at "defs.fpp"
 locate constant C1.a at "defs.fpp"
 locate constant M.a at "defs.fpp"
+locate constant SignalConstant at "defs.fpp"
 locate constant a at "defs.fpp"
 locate constant base_id_def at "defs.fpp"
 locate constant container_id at "defs.fpp"
@@ -34,11 +35,13 @@ locate state machine S at "defs.fpp"
 locate topology M.T1 at "defs.fpp"
 locate topology T1 at "defs.fpp"
 locate type A at "defs.fpp"
+locate type ActionType at "defs.fpp"
 locate type C1.A at "defs.fpp"
 locate type C1.E at "defs.fpp"
 locate type C1.S at "defs.fpp"
 locate type C1.T at "defs.fpp"
 locate type E at "defs.fpp"
+locate type GuardType at "defs.fpp"
 locate type M.A at "defs.fpp"
 locate type M.E at "defs.fpp"
 locate type M.S at "defs.fpp"
@@ -46,4 +49,5 @@ locate type M.T at "defs.fpp"
 locate type Phases at "defs.fpp"
 locate type RecordType at "defs.fpp"
 locate type S at "defs.fpp"
+locate type SignalType at "defs.fpp"
 locate type T at "defs.fpp"
diff --git a/compiler/tools/fpp-locate-uses/test/uses.ref.txt b/compiler/tools/fpp-locate-uses/test/uses.ref.txt
index 2451bd406..149dfcb35 100644
--- a/compiler/tools/fpp-locate-uses/test/uses.ref.txt
+++ b/compiler/tools/fpp-locate-uses/test/uses.ref.txt
@@ -2,6 +2,7 @@ locate component C1 at "defs.fpp"
 locate component M.C1 at "defs.fpp"
 locate constant C1.a at "defs.fpp"
 locate constant M.a at "defs.fpp"
+locate constant SignalConstant at "defs.fpp"
 locate constant a at "defs.fpp"
 locate constant base_id_def at "defs.fpp"
 locate constant container_id at "defs.fpp"
@@ -34,11 +35,13 @@ locate state machine S at "defs.fpp"
 locate topology M.T1 at "defs.fpp"
 locate topology T1 at "defs.fpp"
 locate type A at "defs.fpp"
+locate type ActionType at "defs.fpp"
 locate type C1.A at "defs.fpp"
 locate type C1.E at "defs.fpp"
 locate type C1.S at "defs.fpp"
 locate type C1.T at "defs.fpp"
 locate type E at "defs.fpp"
+locate type GuardType at "defs.fpp"
 locate type M.A at "defs.fpp"
 locate type M.E at "defs.fpp"
 locate type M.S at "defs.fpp"
@@ -46,4 +49,5 @@ locate type M.T at "defs.fpp"
 locate type Phases at "defs.fpp"
 locate type RecordType at "defs.fpp"
 locate type S at "defs.fpp"
+locate type SignalType at "defs.fpp"
 locate type T at "defs.fpp"
diff --git a/compiler/tools/fpp-locate-uses/test/uses/uses.fpp b/compiler/tools/fpp-locate-uses/test/uses/uses.fpp
index 6e9042eea..65184f19b 100644
--- a/compiler/tools/fpp-locate-uses/test/uses/uses.fpp
+++ b/compiler/tools/fpp-locate-uses/test/uses/uses.fpp
@@ -74,3 +74,16 @@ module M {
   }
 
 }
+
+state machine SM {
+
+  action a: ActionType
+  guard g: GuardType
+  signal s1: SignalType
+  signal s2: string size SignalConstant
+
+  initial enter S
+
+  state S
+
+}
diff --git a/compiler/tools/fpp-locate-uses/test/uses_dir.ref.txt b/compiler/tools/fpp-locate-uses/test/uses_dir.ref.txt
index cd2325353..14b783f7c 100644
--- a/compiler/tools/fpp-locate-uses/test/uses_dir.ref.txt
+++ b/compiler/tools/fpp-locate-uses/test/uses_dir.ref.txt
@@ -2,6 +2,7 @@ locate component C1 at "../defs.fpp"
 locate component M.C1 at "../defs.fpp"
 locate constant C1.a at "../defs.fpp"
 locate constant M.a at "../defs.fpp"
+locate constant SignalConstant at "../defs.fpp"
 locate constant a at "../defs.fpp"
 locate constant base_id_def at "../defs.fpp"
 locate constant container_id at "../defs.fpp"
@@ -34,11 +35,13 @@ locate state machine S at "../defs.fpp"
 locate topology M.T1 at "../defs.fpp"
 locate topology T1 at "../defs.fpp"
 locate type A at "../defs.fpp"
+locate type ActionType at "../defs.fpp"
 locate type C1.A at "../defs.fpp"
 locate type C1.E at "../defs.fpp"
 locate type C1.S at "../defs.fpp"
 locate type C1.T at "../defs.fpp"
 locate type E at "../defs.fpp"
+locate type GuardType at "../defs.fpp"
 locate type M.A at "../defs.fpp"
 locate type M.E at "../defs.fpp"
 locate type M.S at "../defs.fpp"
@@ -46,4 +49,5 @@ locate type M.T at "../defs.fpp"
 locate type Phases at "../defs.fpp"
 locate type RecordType at "../defs.fpp"
 locate type S at "../defs.fpp"
+locate type SignalType at "../defs.fpp"
 locate type T at "../defs.fpp"