diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e03db1d27c83d0fa448615be5a2d1f6acdbcd879..ac40a98e2fe0d6c497dcef03f235dbbb23755c14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,8 +45,6 @@ test-single:
     # better to init terraform before allocating public floating IP address (the state could be locked)
     - terraform init -input=false
     - ip=`openstack floating ip create -c floating_ip_address -f value public-muni-147-251-21-GROUP`
-  after_script: &after
-    - openstack floating ip delete $ip
   cache:
     when: always
     key: single
@@ -59,6 +57,7 @@ test-single:
     - ssh-add ./ssh-key.terra1.txt
     - ssh -o PreferredAuthentications=publickey deployadm@$ip "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
     - terraform destroy $args
+    - openstack floating ip delete $ip
   rules:
     - if: '$JOB =~ /all|test-single/'
   artifacts: &artifacts
@@ -69,7 +68,6 @@ test-cluster:
   stage: test
   variables: *tfvars
   before_script: *before
-  after_script: *after
   cache:
     when: always
     key: cluster