diff --git a/moto/rds2/models.py b/moto/rds2/models.py
index 6efbf8492..bc52bdcbf 100644
--- a/moto/rds2/models.py
+++ b/moto/rds2/models.py
@@ -280,6 +280,14 @@ class Database(CloudFormationModel):
{{ database.port }}
{{ database.db_instance_arn }}
+
+ {%- for tag in database.tags -%}
+
+ {{ tag['Key'] }}
+ {{ tag['Value'] }}
+
+ {%- endfor -%}
+
"""
)
return template.render(database=self)
diff --git a/tests/test_rds2/test_rds2.py b/tests/test_rds2/test_rds2.py
index 13e35549a..fd2ffb9d0 100644
--- a/tests/test_rds2/test_rds2.py
+++ b/tests/test_rds2/test_rds2.py
@@ -1749,3 +1749,21 @@ def test_create_db_snapshot_with_iam_authentication():
).get("DBSnapshot")
snapshot.get("IAMDatabaseAuthenticationEnabled").should.equal(True)
+
+
+@mock_rds2
+def test_create_db_instance_with_tags():
+ client = boto3.client("rds", region_name="us-west-2")
+ tags = [{"Key": "foo", "Value": "bar"}, {"Key": "foo1", "Value": "bar1"}]
+ db_instance_identifier = "test-db-instance"
+ resp = client.create_db_instance(
+ DBInstanceIdentifier=db_instance_identifier,
+ Engine="postgres",
+ DBName="staging-postgres",
+ DBInstanceClass="db.m1.small",
+ Tags=tags,
+ )
+ resp["DBInstance"]["TagList"].should.equal(tags)
+
+ resp = client.describe_db_instances(DBInstanceIdentifier=db_instance_identifier)
+ resp["DBInstances"][0]["TagList"].should.equal(tags)