1 files changed, 10 insertions, 15 deletions
diff --git a/test/functional/cases/230_tcp.robot b/test/functional/cases/230_tcp.robot
index d08a4c8e0..69912b03b 100644
--- a/test/functional/cases/230_tcp.robot
+++ b/test/functional/cases/230_tcp.robot
@@ -2,15 +2,15 @@
 Suite Setup      Servers Setup
 Suite Teardown   Servers Teardown
 Library         Process
-Library         ${TESTDIR}/lib/rspamd.py
-Resource        ${TESTDIR}/lib/rspamd.robot
-Variables       ${TESTDIR}/lib/vars.py
+Library         ${RSPAMD_TESTDIR}/lib/rspamd.py
+Resource        ${RSPAMD_TESTDIR}/lib/rspamd.robot
+Variables       ${RSPAMD_TESTDIR}/lib/vars.py
 
 *** Variables ***
-# ${CONFIG}       ${TESTDIR}/configs/http.conf
-${URL_TLD}      ${TESTDIR}/../lua/unit/test_tld.dat
-${CONFIG}       ${TESTDIR}/configs/lua_test.conf
-${MESSAGE}      ${TESTDIR}/messages/spam_message.eml
+${RSPAMD_LUA_SCRIPT}      ${RSPAMD_TESTDIR}/lua/tcp.lua
+${RSPAMD_URL_TLD}      ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+${CONFIG}       ${RSPAMD_TESTDIR}/configs/lua_test.conf
+${MESSAGE}      ${RSPAMD_TESTDIR}/messages/spam_message.eml
 ${RSPAMD_SCOPE}  Suite
 
 *** Test Cases ***
@@ -44,15 +44,10 @@ Sync API TCP post request
   Check url  /content-length  post  HTTP_SYNC_CONTENT_post  hello post
 
 *** Keywords ***
-Lua Setup
-  [Arguments]  ${LUA_SCRIPT}
-  Set Suite Variable  ${LUA_SCRIPT}
-  Generic Setup
-
 Servers Setup
   Run Dummy Http
   Run Dummy Ssl
-  New Setup  LUA_SCRIPT=${TESTDIR}/lua/tcp.lua  URL_TLD=${URL_TLD}
+  New Setup 
 
 Servers Teardown
   ${http_pid} =  Get File  /tmp/dummy_http.pid
@@ -63,12 +58,12 @@ Servers Teardown
 
 Run Dummy Http
   [Arguments]
-  ${result} =  Start Process  ${TESTDIR}/util/dummy_http.py
+  ${result} =  Start Process  ${RSPAMD_TESTDIR}/util/dummy_http.py
   Wait Until Created  /tmp/dummy_http.pid  timeout=2 second
 
 Run Dummy Ssl
   [Arguments]
-  ${result} =  Start Process  ${TESTDIR}/util/dummy_ssl.py  ${TESTDIR}/util/server.pem
+  ${result} =  Start Process  ${RSPAMD_TESTDIR}/util/dummy_ssl.py  ${RSPAMD_TESTDIR}/util/server.pem
   Wait Until Created  /tmp/dummy_ssl.pid  timeout=2 second
 
 Check url