diff --git a/moto/ec2/responses/network_acls.py b/moto/ec2/responses/network_acls.py
index 8ca447338..7f8c5acc5 100644
--- a/moto/ec2/responses/network_acls.py
+++ b/moto/ec2/responses/network_acls.py
@@ -75,7 +75,16 @@ CREATE_NETWORK_ACL_RESPONSE = """
false
-
+
+ {% for tag in network_acl.get_tags() %}
+ -
+ {{ tag.resource_id }}
+ {{ tag.resource_type }}
+ {{ tag.key }}
+ {{ tag.value }}
+
+ {% endfor %}
+
"""
@@ -115,7 +124,16 @@ DESCRIBE_NETWORK_ACL_RESPONSE = """
{% endfor %}
-
+
+ {% for tag in network_acl.get_tags() %}
+ -
+ {{ tag.resource_id }}
+ {{ tag.resource_type }}
+ {{ tag.key }}
+ {{ tag.value }}
+
+ {% endfor %}
+
{% endfor %}
diff --git a/tests/test_ec2/test_network_acls.py b/tests/test_ec2/test_network_acls.py
index 7f5009008..6afa18c2b 100644
--- a/tests/test_ec2/test_network_acls.py
+++ b/tests/test_ec2/test_network_acls.py
@@ -107,5 +107,22 @@ def test_delete_network_acl():
any(acl.id == network_acl.id for acl in updated_network_acls).shouldnt.be.ok
+@mock_ec2
+def test_network_acl_tagging():
+ conn = boto.connect_vpc('the_key', 'the secret')
+ vpc = conn.create_vpc("10.0.0.0/16")
+ network_acl = conn.create_network_acl(vpc.id)
+
+ network_acl.add_tag("a key", "some value")
+
+ tag = conn.get_all_tags()[0]
+ tag.name.should.equal("a key")
+ tag.value.should.equal("some value")
+
+ all_network_acls = conn.get_all_network_acls()
+ test_network_acl = next(na for na in all_network_acls
+ if na.id == network_acl.id)
+ test_network_acl.tags.should.have.length_of(1)
+ test_network_acl.tags["a key"].should.equal("some value")