diff --git a/src/lib/eeze/eeze_sensor.c b/src/lib/eeze/eeze_sensor.c
index 608c9f0d97..8df3187a8a 100644
--- a/src/lib/eeze/eeze_sensor.c
+++ b/src/lib/eeze/eeze_sensor.c
@@ -333,12 +333,44 @@ eeze_sensor_init(void)
    if (!g_handle->modules) return EINA_FALSE;
 
    /* Make sure we create new ecore event types before using them */
-   EEZE_SENSOR_EVENT_SNAP = ecore_event_type_new();
-   EEZE_SENSOR_EVENT_SHAKE = ecore_event_type_new();
-   EEZE_SENSOR_EVENT_DOUBLETAP = ecore_event_type_new();
-   EEZE_SENSOR_EVENT_PANNING = ecore_event_type_new();
-   EEZE_SENSOR_EVENT_FACEDOWN = ecore_event_type_new();
-   EEZE_SENSOR_EVENT_ACCELEROMETER = ecore_event_type_new();
+   if (EEZE_SENSOR_EVENT_ACCELEROMETER == 0)
+      EEZE_SENSOR_EVENT_ACCELEROMETER = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_MAGNETIC == 0)
+      EEZE_SENSOR_EVENT_MAGNETIC = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_ORIENTATION == 0)
+      EEZE_SENSOR_EVENT_ORIENTATION = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_GYROSCOPE == 0)
+      EEZE_SENSOR_EVENT_GYROSCOPE = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_LIGHT == 0)
+      EEZE_SENSOR_EVENT_LIGHT = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_PROXIMITY == 0)
+      EEZE_SENSOR_EVENT_PROXIMITY = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_SNAP == 0)
+      EEZE_SENSOR_EVENT_SNAP = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_SHAKE == 0)
+      EEZE_SENSOR_EVENT_SHAKE = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_DOUBLETAP == 0)
+      EEZE_SENSOR_EVENT_DOUBLETAP = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_PANNING == 0)
+      EEZE_SENSOR_EVENT_PANNING = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_FACEDOWN == 0)
+      EEZE_SENSOR_EVENT_FACEDOWN = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_BAROMETER == 0)
+      EEZE_SENSOR_EVENT_BAROMETER = ecore_event_type_new();
+
+   if (EEZE_SENSOR_EVENT_TEMPERATURE == 0)
+      EEZE_SENSOR_EVENT_TEMPERATURE = ecore_event_type_new();
 
    /* Core is ready so we can load the modules from disk now */
    eeze_sensor_modules_load();
diff --git a/src/tests/eeze/eeze_suite.c b/src/tests/eeze/eeze_suite.c
index 77ac23a17d..1de767e5eb 100644
--- a/src/tests/eeze/eeze_suite.c
+++ b/src/tests/eeze/eeze_suite.c
@@ -524,9 +524,6 @@ START_TEST(eeze_test_sensor_async_read)
    ret = eeze_init();
    fail_if(ret != 1);
 
-   EEZE_SENSOR_EVENT_ACCELEROMETER = ecore_event_type_new();
-   fail_if(EEZE_SENSOR_EVENT_ACCELEROMETER < 1);
-
    handler = ecore_event_handler_add(EEZE_SENSOR_EVENT_ACCELEROMETER, event_cb, NULL);
    fail_if(handler == NULL);
    sens = eeze_sensor_new(EEZE_SENSOR_TYPE_ACCELEROMETER);