diff --git a/tests/test_s3/test_s3_lifecycle.py b/tests/test_s3/test_s3_lifecycle.py
new file mode 100644
index 000000000..55b27543f
--- /dev/null
+++ b/tests/test_s3/test_s3_lifecycle.py
@@ -0,0 +1,101 @@
+from __future__ import unicode_literals
+
+import boto
+from boto.exception import S3ResponseError
+from boto.s3.lifecycle import Lifecycle, Transition, Expiration, Rule
+
+import sure  # noqa
+
+from moto import mock_s3
+
+
+@mock_s3
+def test_lifecycle_create():
+    conn = boto.s3.connect_to_region("us-west-1")
+    bucket = conn.create_bucket("foobar")
+
+    lifecycle = Lifecycle()
+    lifecycle.add_rule('myid', '', 'Enabled', 30)
+    bucket.configure_lifecycle(lifecycle)
+    response = bucket.get_lifecycle_config()
+    len(response).should.equal(1)
+    lifecycle = response[0]
+    lifecycle.id.should.equal('myid')
+    lifecycle.prefix.should.equal('')
+    lifecycle.status.should.equal('Enabled')
+    lifecycle.transition.should.equal(None)
+
+
+@mock_s3
+def test_lifecycle_with_glacier_transition():
+    conn = boto.s3.connect_to_region("us-west-1")
+    bucket = conn.create_bucket("foobar")
+
+    lifecycle = Lifecycle()
+    transition = Transition(days=30, storage_class='GLACIER')
+    rule = Rule('myid', prefix='', status='Enabled', expiration=None,
+                transition=transition)
+    lifecycle.append(rule)
+    bucket.configure_lifecycle(lifecycle)
+    response = bucket.get_lifecycle_config()
+    transition = response[0].transition
+    transition.days.should.equal(30)
+    transition.storage_class.should.equal('GLACIER')
+    transition.date.should.equal(None)
+
+
+@mock_s3
+def test_lifecycle_multi():
+    conn = boto.s3.connect_to_region("us-west-1")
+    bucket = conn.create_bucket("foobar")
+
+    date = '2022-10-12T00:00:00.000Z'
+    sc = 'GLACIER'
+    lifecycle = Lifecycle()
+    lifecycle.add_rule("1", "1/", "Enabled", 1)
+    lifecycle.add_rule("2", "2/", "Enabled", Expiration(days=2))
+    lifecycle.add_rule("3", "3/", "Enabled", Expiration(date=date))
+    lifecycle.add_rule("4", "4/", "Enabled", None,
+        Transition(days=4, storage_class=sc))
+    lifecycle.add_rule("5", "5/", "Enabled", None,
+        Transition(date=date, storage_class=sc))
+
+    bucket.configure_lifecycle(lifecycle)
+    # read the lifecycle back
+    rules = bucket.get_lifecycle_config()
+
+    for rule in rules:
+        if rule.id == "1":
+            rule.prefix.should.equal("1/")
+            rule.expiration.days.should.equal(1)
+        elif rule.id == "2":
+            rule.prefix.should.equal("2/")
+            rule.expiration.days.should.equal(2)
+        elif rule.id == "3":
+            rule.prefix.should.equal("3/")
+            rule.expiration.date.should.equal(date)
+        elif rule.id == "4":
+            rule.prefix.should.equal("4/")
+            rule.transition.days.should.equal(4)
+            rule.transition.storage_class.should.equal(sc)
+        elif rule.id == "5":
+            rule.prefix.should.equal("5/")
+            rule.transition.date.should.equal(date)
+            rule.transition.storage_class.should.equal(sc)
+        else:
+            assert False, "Invalid rule id"
+
+
+@mock_s3
+def test_lifecycle_delete():
+    conn = boto.s3.connect_to_region("us-west-1")
+    bucket = conn.create_bucket("foobar")
+
+    lifecycle = Lifecycle()
+    lifecycle.add_rule(expiration=30)
+    bucket.configure_lifecycle(lifecycle)
+    response = bucket.get_lifecycle_config()
+    response.should.have.length_of(1)
+
+    bucket.delete_lifecycle_configuration()
+    bucket.get_lifecycle_config.when.called_with().should.throw(S3ResponseError)