diff --git a/frameworks/Kieker/scripts/benchmark.sh b/frameworks/Kieker/scripts/benchmark.sh
index f8633e42e6ed2a8c8aad31f6269cc11922682d8f..25694a214d3f7805b9aee48e2d70bf2ef3e61171 100755
--- a/frameworks/Kieker/scripts/benchmark.sh
+++ b/frameworks/Kieker/scripts/benchmark.sh
@@ -18,6 +18,8 @@ fi
 
 source ../../common-functions.sh
 
+getKiekerAgent
+
 if [ -f "${BASE_DIR}/common-functions" ] ; then
 	. ${BASE_DIR}/common-functions
 else
diff --git a/frameworks/Kieker/scripts/run-benchmark.sh b/frameworks/Kieker/scripts/run-benchmark.sh
index 4a2b5854afbccb50180c448ae3179f7d71858d1d..b80da7c8f2ae923edcbbd11ed758c27c3a1d94f3 100755
--- a/frameworks/Kieker/scripts/run-benchmark.sh
+++ b/frameworks/Kieker/scripts/run-benchmark.sh
@@ -28,10 +28,6 @@ cd ${BASE_DIR}
 ## setup
 # install benchmark
 tar -xvpf ${BASE_DIR}/../../../benchmark/build/distributions/benchmark.tar
-# get agent
-export VERSION_PATH=`curl "https://oss.sonatype.org/service/local/repositories/snapshots/content/net/kieker-monitoring/kieker/" | grep '<resourceURI>' | sed 's/ *<resourceURI>//g' | sed 's/<\/resourceURI>//g' | grep '/$'`
-export AGENT_PATH=`curl "${VERSION_PATH}" | grep 'aspectj.jar</resourceURI' | sort | sed 's/ *<resourceURI>//g' | sed 's/<\/resourceURI>//g' | tail -1`
-curl "${AGENT_PATH}" > "${AGENT}"
 # copy receiver
 tar -xvpf ${BASE_DIR}/../../../tools/receiver/build/distributions/receiver.tar
 # copy result compiler
diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh
index 11ae83f33145e4e94d7a0d09a4386bd886278b70..3be55207f8e49424bdbcf35a62fd27bf13e4f9a1 100644
--- a/frameworks/common-functions.sh
+++ b/frameworks/common-functions.sh
@@ -12,6 +12,17 @@ function cleanup-results() {
   [ -f ${DATA_DIR}/nohup.out ] && > ${DATA_DIR}/nohup.out
 }
 
+function getKiekerAgent() {
+	echo "Checking whether Kieker is present in $AGENT"
+	if [ ! -f $AGENT ]
+	then
+		# get agent
+		export VERSION_PATH=`curl "https://oss.sonatype.org/service/local/repositories/snapshots/content/net/kieker-monitoring/kieker/" | grep '<resourceURI>' | sed 's/ *<resourceURI>//g' | sed 's/<\/resourceURI>//g' | grep '/$'`
+		export AGENT_PATH=`curl "${VERSION_PATH}" | grep 'aspectj.jar</resourceURI' | sort | sed 's/ *<resourceURI>//g' | sed 's/<\/resourceURI>//g' | tail -1`
+		curl "${AGENT_PATH}" > "${AGENT}"
+	fi
+}
+
 # Initialize all unset parameters
 if [ -z $SLEEP_TIME ]; then
 	SLEEP_TIME=30           ## 30