diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 6b4cad4849..2ecd3d449b 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -212,32 +212,7 @@ bin/edje/edje_convert_main.c \
 lib/edje/edje_convert.c \
 tests/edje/edje_tests_helpers.h \
 tests/edje/data/complex_layout.edc \
-tests/edje/data/test_layout.edc \
-tests/emotion/data/theme.edc \
-tests/emotion/data/icon.edc \
-tests/emotion/data/bpause.png \
-tests/emotion/data/bplay.png \
-tests/emotion/data/bstop.png \
-tests/emotion/data/e_logo.png \
-tests/emotion/data/fr1.png \
-tests/emotion/data/fr2.png \
-tests/emotion/data/fr3.png \
-tests/emotion/data/fr4.png \
-tests/emotion/data/fr5.png \
-tests/emotion/data/fr6.png \
-tests/emotion/data/fr7.png \
-tests/emotion/data/h_slider.png \
-tests/emotion/data/knob.png \
-tests/emotion/data/orb.png \
-tests/emotion/data/pnl.png \
-tests/emotion/data/sl.png \
-tests/emotion/data/tiles.png \
-tests/emotion/data/video_frame_bottom.png \
-tests/emotion/data/video_frame_left.png \
-tests/emotion/data/video_frame_right.png \
-tests/emotion/data/video_frame_top.png \
-tests/emotion/data/whb.png \
-tests/emotion/data/window_inner_shadow.png
+tests/edje/data/test_layout.edc
 
 
 bin_SCRIPTS += bin/edje/edje_recc
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 1e99250841..668ea2094e 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -191,7 +191,16 @@ tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc${EXE
 	@$(MKDIR_P) tests/emotion/data
 	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/emotion/data $< $@
 
-EMOTION_DATA_FILES = \
+emotiondatafilesdir = $(datadir)/emotion/data
+emotiondatafiles_DATA = tests/emotion/data/theme.edj
+CLEANFILES += tests/emotion/data/theme.edj
+
+endif
+endif
+
+# Those probably should be in the if block, but then
+# "make distcheck" would not work
+EXTRA_DIST += \
 tests/emotion/data/bpause.png \
 tests/emotion/data/bplay.png \
 tests/emotion/data/bstop.png \
@@ -219,14 +228,5 @@ tests/emotion/data/video_frame_left.png \
 tests/emotion/data/video_frame_right.png \
 tests/emotion/data/video_frame_top.png \
 tests/emotion/data/whb.png \
-tests/emotion/data/window_inner_shadow.png
-
-emotiondatafilesdir = $(datadir)/emotion/data
-emotiondatafiles_DATA = tests/emotion/data/theme.edj
-CLEANFILES += tests/emotion/data/theme.edj
-endif
-endif
-
-EXTRA_DIST += \
-$(EMOTION_DATA_FILES) \
+tests/emotion/data/window_inner_shadow.png \
 modules/emotion/generic/README