diff --git a/rclrust-msg-gen/src/parser/action.rs b/rclrust-msg-gen/src/parser/action.rs
index 10100122..1f58c16d 100644
--- a/rclrust-msg-gen/src/parser/action.rs
+++ b/rclrust-msg-gen/src/parser/action.rs
@@ -69,7 +69,7 @@ mod test {
 
     fn parse_action_def(srv_name: &str) -> Result<Action> {
         let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-            .join(format!("tests/test_msgs/action/{}.action", srv_name));
+            .join(format!("test_msgs/action/{}.action", srv_name));
         parse_action_file("test_msgs", path)
     }
 
diff --git a/rclrust-msg-gen/src/parser/message.rs b/rclrust-msg-gen/src/parser/message.rs
index 51e68c22..2d1d23bb 100644
--- a/rclrust-msg-gen/src/parser/message.rs
+++ b/rclrust-msg-gen/src/parser/message.rs
@@ -75,7 +75,7 @@ mod test {
 
     fn parse_msg_def(msg_name: &str) -> Result<Message> {
         let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-            .join(format!("tests/test_msgs/msg/{}.msg", msg_name));
+            .join(format!("test_msgs/msg/{}.msg", msg_name));
         parse_message_file("test_msgs", path)
     }
 
diff --git a/rclrust-msg-gen/src/parser/service.rs b/rclrust-msg-gen/src/parser/service.rs
index f5fbdfd3..21163649 100644
--- a/rclrust-msg-gen/src/parser/service.rs
+++ b/rclrust-msg-gen/src/parser/service.rs
@@ -59,7 +59,7 @@ mod test {
 
     fn parse_srv_def(srv_name: &str) -> Result<Service> {
         let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-            .join(format!("tests/test_msgs/srv/{}.srv", srv_name));
+            .join(format!("test_msgs/srv/{}.srv", srv_name));
         parse_service_file("test_msgs", path)
     }
 
diff --git a/rclrust-msg-gen/tests/test_msgs/action/Fibonacci.action b/rclrust-msg-gen/test_msgs/action/Fibonacci.action
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/action/Fibonacci.action
rename to rclrust-msg-gen/test_msgs/action/Fibonacci.action
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/Arrays.msg b/rclrust-msg-gen/test_msgs/msg/Arrays.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/Arrays.msg
rename to rclrust-msg-gen/test_msgs/msg/Arrays.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/BasicTypes.msg b/rclrust-msg-gen/test_msgs/msg/BasicTypes.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/BasicTypes.msg
rename to rclrust-msg-gen/test_msgs/msg/BasicTypes.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/BoundedSequences.msg b/rclrust-msg-gen/test_msgs/msg/BoundedSequences.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/BoundedSequences.msg
rename to rclrust-msg-gen/test_msgs/msg/BoundedSequences.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/Constants.msg b/rclrust-msg-gen/test_msgs/msg/Constants.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/Constants.msg
rename to rclrust-msg-gen/test_msgs/msg/Constants.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/Defaults.msg b/rclrust-msg-gen/test_msgs/msg/Defaults.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/Defaults.msg
rename to rclrust-msg-gen/test_msgs/msg/Defaults.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/Empty.msg b/rclrust-msg-gen/test_msgs/msg/Empty.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/Empty.msg
rename to rclrust-msg-gen/test_msgs/msg/Empty.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/MultiNested.msg b/rclrust-msg-gen/test_msgs/msg/MultiNested.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/MultiNested.msg
rename to rclrust-msg-gen/test_msgs/msg/MultiNested.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/Nested.msg b/rclrust-msg-gen/test_msgs/msg/Nested.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/Nested.msg
rename to rclrust-msg-gen/test_msgs/msg/Nested.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/Strings.msg b/rclrust-msg-gen/test_msgs/msg/Strings.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/Strings.msg
rename to rclrust-msg-gen/test_msgs/msg/Strings.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/UnboundedSequences.msg b/rclrust-msg-gen/test_msgs/msg/UnboundedSequences.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/UnboundedSequences.msg
rename to rclrust-msg-gen/test_msgs/msg/UnboundedSequences.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/msg/WStrings.msg b/rclrust-msg-gen/test_msgs/msg/WStrings.msg
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/msg/WStrings.msg
rename to rclrust-msg-gen/test_msgs/msg/WStrings.msg
diff --git a/rclrust-msg-gen/tests/test_msgs/srv/Arrays.srv b/rclrust-msg-gen/test_msgs/srv/Arrays.srv
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/srv/Arrays.srv
rename to rclrust-msg-gen/test_msgs/srv/Arrays.srv
diff --git a/rclrust-msg-gen/tests/test_msgs/srv/BasicTypes.srv b/rclrust-msg-gen/test_msgs/srv/BasicTypes.srv
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/srv/BasicTypes.srv
rename to rclrust-msg-gen/test_msgs/srv/BasicTypes.srv
diff --git a/rclrust-msg-gen/tests/test_msgs/srv/Empty.srv b/rclrust-msg-gen/test_msgs/srv/Empty.srv
similarity index 100%
rename from rclrust-msg-gen/tests/test_msgs/srv/Empty.srv
rename to rclrust-msg-gen/test_msgs/srv/Empty.srv
diff --git a/rclrust-msg-gen/tests/test_parse_msg.rs b/rclrust-msg-gen/tests/test_parse_msg.rs
deleted file mode 100644
index e69de29b..00000000