diff --git a/tests/memcached/memcached.bats b/tests/memcached/memcached.bats
index 91ae8c0..cef17be 100755
--- a/tests/memcached/memcached.bats
+++ b/tests/memcached/memcached.bats
@@ -4,27 +4,22 @@
 
 load ../utils
 
-
-@test "Start memcached server" {
+@test "Accessing statistics" {
+    # start the container first
     docker run --name memcached-server --rm -d clearlinux/memcached
     sleep 5
     run check_container_status memcached-server
     [ "$status" -eq 0 ]
-}
 
-@test "Accessing statistics" {
     # get ip address
     run get_container_ip memcached-server
     [ "$status" -eq 0 ]
     ipaddr="$output"
 
     echo stats | nc $ipaddr 11211
-}
 
-
-@test "Stop memcached server" {
+    # stop the container
     docker stop memcached-server
     sleep 3
     run check_container_status memcached-server
-    [ "$status" -eq 1 ]
 }
diff --git a/tests/nginx/nginx.bats b/tests/nginx/nginx.bats
index 00bbfdf..135d17a 100755
--- a/tests/nginx/nginx.bats
+++ b/tests/nginx/nginx.bats
@@ -5,18 +5,16 @@
 load ../utils
 
 
-@test "Start nginx server" {
+@test "Connecting to nginx server" {
+    # start the container first
     docker run --name nginx-server --rm -d -p 8080:80 clearlinux/nginx
     sleep 5
     run check_container_status nginx-server
     [ "$status" -eq 0 ]
-}
 
-@test "Connecting to nginx server" {
     curl -svL http://localhost:8080/
-}
 
-@test "Stop nginx server" {
+    # stop the container
     docker stop nginx-server
     sleep 3
     run check_container_status nginx-server
diff --git a/tests/redis/redis.bats b/tests/redis/redis.bats
index 922438f..ac01567 100755
--- a/tests/redis/redis.bats
+++ b/tests/redis/redis.bats
@@ -4,14 +4,13 @@
 
 load ../utils
 
-@test "Start redis server" {
+@test "Redis LPUSH test" {
+    # start tje container first
     docker run --name redis-server --rm -d clearlinux/redis redis-server --protected-mode no
-    sleep 5 
+    sleep 5
     run check_container_status redis-server
     [ "$status" -eq 0 ]
-}
 
-@test "Redis LPUSH test" {
     # get ip address
     run get_container_ip redis-server
     [ "$status" -eq 0 ]
@@ -20,9 +19,21 @@ load ../utils
     # push two integers
     docker run --rm clearlinux/redis redis-cli -h $ipaddr lpush mylist x
     docker run --rm clearlinux/redis redis-cli -h $ipaddr lpush mylist y
+
+    # stop the container
+    docker stop redis-server
+    sleep 3
+    run check_container_status redis-server
+    [ "$status" -eq 1 ]
 }
 
 @test "Redis LRANGE test" {
+    # start tje container first
+    docker run --name redis-server --rm -d clearlinux/redis redis-server --protected-mode no
+    sleep 5
+    run check_container_status redis-server
+    [ "$status" -eq 0 ]
+
     # get ip address
     run get_container_ip redis-server
     [ "$status" -eq 0 ]
@@ -30,12 +41,11 @@ load ../utils
 
     # push two integers
     docker run --rm clearlinux/redis redis-cli -h $ipaddr lrange mylist 0 -1
-}
 
-
-@test "Stop redis server" {
+    # stop the container
     docker stop redis-server
     sleep 3
     run check_container_status redis-server
     [ "$status" -eq 1 ]
 }
+