diff --git a/Makefile b/Makefile
index ffa0d8b1e43f995ce3e7cbdd196a7be3dcda5425..51fb20efe809cdbc0ba08433473763bae730e25d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ ROSETTASDKPLUGINS:=${ROSETTASDK}/../../bundled_plugins/
 ROSETTASDKJARS=$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar")
 
 # classpath
-JUNITCLASSPATH=/usr/share/java/junit4.jar
+JUNITCLASSPATH:=/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g")
 #SOURCESCLASSPATH=org/slub/rosetta/dps/repository/plugin/storage/nfs
 CLASSPATH:=./java:${ROSETTASDKDEPOSIT}/../src/:${ROSETTASDKDEPOSIT}/xmlbeans-2.3.0.jar:${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar:${ROSETTASDKDEPOSIT}/log4j-1.2.14.jar:${ROSETTASDKPLUGINS}/NFSStoragePlugin.jar
 
@@ -43,7 +43,7 @@ jarclean:
 	@rm -Rf $(BUILD)
 
 test:   $(OBJS) 
-	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore 
+	java -cp ${CLASSPATH}:$(JUNITCLASSPATH):$(JAR) org.slub.rosetta.dps.repository.plugin.SLUBVirusCheckClamAVPlugin EICAR/eicar
 
 clean: jarclean
 	@rm -Rf doc/