diff --git a/TESTS/integration/COMMON/common_defines_fs_test.h b/TESTS/integration/COMMON/common_defines_fs_test.h
index e0db35150ef..0deba95028f 100644
--- a/TESTS/integration/COMMON/common_defines_fs_test.h
+++ b/TESTS/integration/COMMON/common_defines_fs_test.h
@@ -16,9 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "mbed_trace.h"
-
-#define TRACE_GROUP "GRNT"
 
 #define FS_FAT 1
 #define FS_LFS 2
diff --git a/TESTS/integration/COMMON/download_test.cpp b/TESTS/integration/COMMON/download_test.cpp
index cde62f51a9c..12037fa17d9 100644
--- a/TESTS/integration/COMMON/download_test.cpp
+++ b/TESTS/integration/COMMON/download_test.cpp
@@ -27,7 +27,7 @@
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
 #include <string>
-#include "common_defines_test.h"
+#include "download_test.h"
 
 #define MAX_THREADS 5
 
diff --git a/TESTS/integration/COMMON/download_test.h b/TESTS/integration/COMMON/download_test.h
index d755b2c9e85..4e951657350 100644
--- a/TESTS/integration/COMMON/download_test.h
+++ b/TESTS/integration/COMMON/download_test.h
@@ -20,5 +20,9 @@
 /*
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
+
+#include "mbed_trace.h"
+
+#define TRACE_GROUP "GRNT"
 size_t download_test(NetworkInterface *interface, const unsigned char *data, size_t data_length, size_t buff_size, uint32_t thread_id = 0);
 
diff --git a/TESTS/integration/COMMON/file_test.cpp b/TESTS/integration/COMMON/file_test.cpp
index 27c4b5394d0..ad9debd8d8d 100644
--- a/TESTS/integration/COMMON/file_test.cpp
+++ b/TESTS/integration/COMMON/file_test.cpp
@@ -24,7 +24,7 @@
 
 #include "mbed.h"
 #include "unity/unity.h"
-#include "common_defines_test.h"
+#include "file_test.h"
 
 void file_test_write(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size)
 {
diff --git a/TESTS/integration/COMMON/file_test.h b/TESTS/integration/COMMON/file_test.h
index bde36948134..3db755e22fb 100644
--- a/TESTS/integration/COMMON/file_test.h
+++ b/TESTS/integration/COMMON/file_test.h
@@ -20,6 +20,10 @@
 /*
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
+#include "mbed_trace.h"
+
+#define TRACE_GROUP "GRNT"
+
 void file_test_write(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size);
 
 void file_test_read(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size);