diff --git a/exercise.sh b/exercise.sh
index 99b0f3b..c737bcc 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -191,3 +191,22 @@ nova secgroup-delete $SECGROUP
 
 # make sure that we can describe instances
 euca-describe-instances
+
+# Testing Swift
+# =============
+
+# Check if we have to swift via keystone
+swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0 -U admin -K $ADMIN_PASSWORD stat
+
+# We start by creating a test container
+swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0 -U admin -K $ADMIN_PASSWORD post testcontainer
+
+# add some files into it.
+swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0 -U admin -K $ADMIN_PASSWORD upload testcontainer /etc/issue
+
+# list them
+swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0 -U admin -K $ADMIN_PASSWORD list testcontainer 
+
+# And we may want to delete them now that we have tested that
+# everything works.
+swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0 -U admin -K $ADMIN_PASSWORD delete --all testcontainer
diff --git a/stack.sh b/stack.sh
index d012507..3571df5 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1011,10 +1011,6 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
     echo "examples on using novaclient command line is in exercise.sh"
     echo "the default users are: admin and demo"
     echo "the password: $ADMIN_PASSWORD"
-    if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
-        echo "Swift: swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0 -U admin:admin -K $ADMIN_PASSWORD stat"
-    fi
-
 fi
 
 # indicate how long this took to run (bash maintained variable 'SECONDS')