diff --git a/titan_executor_api/TITAN_Executor_API_test/build.xml b/titan_executor_api/TITAN_Executor_API_test/build.xml
index 5d26af5d8f0f5e1048b8b054bbdf257a022ed291..3d0023c8c46cff2081d6b01cad681f1cb11441e6 100644
--- a/titan_executor_api/TITAN_Executor_API_test/build.xml
+++ b/titan_executor_api/TITAN_Executor_API_test/build.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2000-2015 Ericsson Telecom AB
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2000-2016 Ericsson Telecom AB
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+  Janos Zoltan Szabo – initial implementation
 -->
 <project basedir="." default="build" name="TITAN_Executor_API_test">
     <property environment="env"/>
-    <property name="LIB" value="../../../titan_playground/jar"/>
     <property name="junit.output.dir" value="junit"/>
     <property name="TITAN_Executor_API.location" value="../TITAN_Executor_API"/>
     <property name="debuglevel" value="source,lines,vars"/>
     <property name="target" value="1.7"/>
     <property name="source" value="1.7"/>
     <path id="JUnit 4.libraryclasspath">
-        <pathelement location="${LIB}/org.junit_4.11.0.v201303080030/junit.jar"/>
-        <pathelement location="${LIB}/org.hamcrest.core_1.3.0.v201303031735.jar"/>
+        <pathelement location="${junit.full}"/>
+        <pathelement location="${hamcrest.full}"/>
     </path>
     <path id="TITAN_Executor_API.classpath">
         <pathelement location="${TITAN_Executor_API.location}/bin"/>
diff --git a/titan_executor_api/TITAN_Executor_API_test/build_and_run_test.sh b/titan_executor_api/TITAN_Executor_API_test/build_and_run_test.sh
index 43e564b9c3d85eea01889418734c2abdd6335fed..dde34e316ab9b4ced21587d57e6793c0fec40d2e 100755
--- a/titan_executor_api/TITAN_Executor_API_test/build_and_run_test.sh
+++ b/titan_executor_api/TITAN_Executor_API_test/build_and_run_test.sh
@@ -1,22 +1,19 @@
 ###############################################################################
-# Copyright (c) 2000-2015 Ericsson Telecom AB
+# Copyright (c) 2000-2016 Ericsson Telecom AB
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   Janos Zoltan Szabo – initial implementation
+#
 ###############################################################################
 
 # EDIT THESE LINES TO SET CORRECT JAR LOCATIONS
 
-LIB_DIR_GIT=$HOME/git/titan_playground/jar
-
-# short file name
-JUNIT_JAR=junit.jar
-HAMCREST_JAR=org.hamcrest.core_1.3.0.v201303031735.jar
-
-# full path
-JUNIT_FULL=${LIB_DIR_GIT}/org.junit_4.11.0.v201303080030/${JUNIT_JAR}
-HAMCREST_FULL=${LIB_DIR_GIT}/${HAMCREST_JAR}
+JUNIT_FULL=$HOME/lib/org.junit_4.11.0.v201303080030/junit.jar
+HAMCREST_FULL=$HOME/lib/org.hamcrest.core_1.3.0.v201303031735.jar
 
 #---------------------------------------------------------------------
 # DO NOT EDIT AFTER THIS LINE
@@ -77,6 +74,7 @@ file_exist ${HAMCREST_FULL}
 
 # run test (and build its dependencies if needed)
 ant \
--lib ${JUNIT_FULL} \
--lib ${HAMCREST_FULL} \
+-Djunit.full=${JUNIT_FULL} \
+-Dhamcrest.full=${HAMCREST_FULL} \
 TITAN_Executor_API_test
+