diff --git a/Makefile b/Makefile
index 51fb20efe809cdbc0ba08433473763bae730e25d..153141a541ac065cf581e8affc74c238ade0c016 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,10 @@ SOURCES=java/org/slub/rosetta/dps/repository/plugin/SLUBVirusCheckClamAVPlugin.j
 OBJS=$(SOURCES:.java=.class)
 JAR=SLUBVirusCheckPlugin.jar
 BUILD:=build/
+export CMD=/usr/bin/java -cp $(CLASSPATH):$(JUNITCLASSPATH):$(JAR) org.slub.rosetta.dps.repository.plugin.SLUBVirusCheckClamAVPlugin
+#export CMD=echo SIGNATURE: Eicar-Signature
+CMD_EICAR:=$(shell ${CMD} EICAR/eicar | grep -F 'SIGNATURE:')
+CMD_NOVIRUS:=$(shell ${CMD} Makefile | grep -F 'SIGNATURE:')
 
 all: $(BUILD) $(JAR)
 
@@ -42,8 +46,19 @@ help:
 jarclean:
 	@rm -Rf $(BUILD)
 
-test:   $(OBJS) 
-	java -cp ${CLASSPATH}:$(JUNITCLASSPATH):$(JAR) org.slub.rosetta.dps.repository.plugin.SLUBVirusCheckClamAVPlugin EICAR/eicar
+test:   $(OBJS)
+	@echo -n "testing EICAR: "
+ifeq "$(CMD_EICAR)" "RESULT: 2 SIGNATURE: Eicar-Signature"
+	@echo pass;
+else
+	@echo fail; exit 2;
+endif
+	@echo -n "testing No virus: "
+ifeq "$(CMD_NOVIRUS)" "RESULT: 0 SIGNATURE: "
+	@echo pass;
+else
+	@echo fail; exit 2;
+endif
 
 clean: jarclean
 	@rm -Rf doc/