diff --git a/pcl_ros/samples/sample_statistical_outlier_removal.launch b/pcl_ros/samples/sample_statistical_outlier_removal.launch
index 7e4b7e8a..1aeeed36 100644
--- a/pcl_ros/samples/sample_statistical_outlier_removal.launch
+++ b/pcl_ros/samples/sample_statistical_outlier_removal.launch
@@ -3,8 +3,9 @@
   <arg name="gui" default="true" />
 
   <!-- use voxel_grid for small cpu load in filtering -->
-  <include file="$(find pcl_ros)/samples/sample_voxel_grid.launch">
+  <include file="$(find pcl_ros)/samples/pcl_ros/filters/sample_voxel_grid.launch">
     <arg name="gui" value="false" />
+    <arg name="test" value="false" />
     <arg name="leaf_size" value="0.02" />
   </include>
 
@@ -32,7 +33,7 @@
   <group if="$(arg gui)">
     <node name="rviz"
           pkg="rviz" type="rviz"
-          args="-d $(find pcl_ros)/samples/config/statistical_outlier_removal.rviz">
+          args="-d $(find pcl_ros)/samples/pcl_ros/filters/config/statistical_outlier_removal.rviz">
     </node>
   </group>
 
diff --git a/pcl_ros/samples/sample_voxel_grid.launch b/pcl_ros/samples/sample_voxel_grid.launch
index 3e9892b6..86596bdf 100644
--- a/pcl_ros/samples/sample_voxel_grid.launch
+++ b/pcl_ros/samples/sample_voxel_grid.launch
@@ -1,6 +1,7 @@
 <launch>
 
   <arg name="gui" default="true" />
+  <arg name="test" default="true" />
 
   <arg name="leaf_size" default="0.05" />
 
@@ -20,16 +21,18 @@
     </rosparam>
   </node>
 
-  <test test-name="test_voxel_grid"
-        name="test_voxel_grid"
-        pkg="rostest" type="hztest">
-    <rosparam>
-      topic: /voxel_grid/output
-      hz: 20
-      hzerror: 15
-      test_duration: 5.0
-    </rosparam>
-  </test>
+  <group if="$(arg test)">
+    <test test-name="test_voxel_grid"
+          name="test_voxel_grid"
+          pkg="rostest" type="hztest">
+      <rosparam>
+        topic: /voxel_grid/output
+        hz: 20
+        hzerror: 15
+        test_duration: 5.0
+      </rosparam>
+    </test>
+  </group>
 
   <group if="$(arg gui)">
     <node name="rviz"