diff --git a/BlueBerry/CMake/berryTestingHelpers.cmake b/BlueBerry/CMake/berryTestingHelpers.cmake
index 1733624fa4..de424a262b 100755
--- a/BlueBerry/CMake/berryTestingHelpers.cmake
+++ b/BlueBerry/CMake/berryTestingHelpers.cmake
@@ -1,64 +1,68 @@
 
 # Call this macro after calling MACRO_CREATE_PLUGIN in your CMakeLists.txt
 #
 # Variables:
 #
 # - BLUEBERRY_TEST_APP contains the name of the executable which will start the OSGi framework
 #
 MACRO(MACRO_TEST_PLUGIN)
 
   SET(_cla_switch "--")
   IF(WIN32)
     IF(MSYS)
       SET(_cla_switch "//")
     ELSE()
       SET(_cla_switch "/")
     ENDIF()
   ENDIF()
 
-  STRING(REPLACE "_" "." BUNDLE-SYMBOLICNAME ${PROJECT_NAME})
+  IF(NOT BUNDLE-SYMBOLICNAME)
+    STRING(REPLACE "_" "." BUNDLE-SYMBOLICNAME ${PROJECT_NAME})
+  ENDIF()
   ADD_TEST(${BUNDLE-SYMBOLICNAME} ${BLUEBERRY_TEST_APP} ${_cla_switch}BlueBerry.application=coretestapplication ${_cla_switch}BlueBerry.testplugin=${BUNDLE-SYMBOLICNAME})
   
   SET(_labels ${ARGN})
   IF(NOT _labels)
     SET(_labels BlueBerry)
   ENDIF()
   SET_PROPERTY(TEST ${BUNDLE-SYMBOLICNAME} PROPERTY LABELS ${_labels})
   
 ENDMACRO(MACRO_TEST_PLUGIN)
 
 # Variables:
 #
 # - BLUEBERRY_UI_TEST_APP contains the name of the executable which will start the OSGi framework
 # - BLUEBERRY_TEST_APP_ID contains the application id of the application to test. If empty,
 #                          a minimalistic default application will be started
 MACRO(MACRO_TEST_UIPLUGIN)
 
   SET(_cla_switch "--")
   IF(WIN32)
     IF(MSYS)
       SET(_cla_switch "//")
     ELSE()
       SET(_cla_switch "/")
     ENDIF()
   ENDIF()
 
-  STRING(REPLACE "_" "." BUNDLE-SYMBOLICNAME ${PROJECT_NAME})
+  IF(NOT BUNDLE-SYMBOLICNAME)
+    STRING(REPLACE "_" "." BUNDLE-SYMBOLICNAME ${PROJECT_NAME})
+  ENDIF()
   
   IF(BLUEBERRY_ENABLE_GUI_TESTING)
     IF(BLUEBERRY_TEST_APP_ID)
       SET(_app_id_arg "${_cla_switch}BlueBerry.testapplication=${BLUEBERRY_TEST_APP_ID}")
     ELSE()
       SET(_app_id_arg )
     ENDIF()
         
     ADD_TEST(${BUNDLE-SYMBOLICNAME} ${BLUEBERRY_UI_TEST_APP} ${_cla_switch}BlueBerry.application=uitestapplication ${_app_id_arg} ${_cla_switch}BlueBerry.testplugin=${BUNDLE-SYMBOLICNAME})
     
     SET(_labels ${ARGN})
     IF(NOT _labels)
       SET(_labels BlueBerry)
     ENDIF()
     SET_PROPERTY(TEST ${BUNDLE-SYMBOLICNAME} PROPERTY LABELS ${_labels})
   ENDIF()
   
 ENDMACRO(MACRO_TEST_UIPLUGIN)