diff --git a/moto/rds/responses.py b/moto/rds/responses.py
index cdcbe3603..0895a8bf2 100644
--- a/moto/rds/responses.py
+++ b/moto/rds/responses.py
@@ -114,8 +114,7 @@ class RDSResponse(BaseResponse):
 
     def delete_db_instance(self):
         db_instance_identifier = self._get_param('DBInstanceIdentifier')
-        db_snapshot_name = self._get_param('FinalDBSnapshotIdentifier')
-        database = self.backend.delete_database(db_instance_identifier, db_snapshot_name)
+        database = self.backend.delete_database(db_instance_identifier)
         template = self.response_template(DELETE_DATABASE_TEMPLATE)
         return template.render(database=database)
 
diff --git a/moto/rds2/responses.py b/moto/rds2/responses.py
index cdadd3424..b26f2e347 100644
--- a/moto/rds2/responses.py
+++ b/moto/rds2/responses.py
@@ -140,7 +140,8 @@ class RDS2Response(BaseResponse):
 
     def delete_db_instance(self):
         db_instance_identifier = self._get_param('DBInstanceIdentifier')
-        database = self.backend.delete_database(db_instance_identifier)
+        db_snapshot_name = self._get_param('FinalDBSnapshotIdentifier')
+        database = self.backend.delete_database(db_instance_identifier, db_snapshot_name)
         template = self.response_template(DELETE_DATABASE_TEMPLATE)
         return template.render(database=database)
 
diff --git a/tests/test_rds2/test_rds2.py b/tests/test_rds2/test_rds2.py
index 7a801257c..f869dc1ce 100644
--- a/tests/test_rds2/test_rds2.py
+++ b/tests/test_rds2/test_rds2.py
@@ -145,10 +145,10 @@ def test_delete_database():
     conn = boto3.client('rds', region_name='us-west-2')
     instances = conn.describe_db_instances()
     list(instances['DBInstances']).should.have.length_of(0)
-    conn.create_db_instance(DBInstanceIdentifier='db-master-1',
+    conn.create_db_instance(DBInstanceIdentifier='db-primary-1',
                             AllocatedStorage=10,
-                            DBInstanceClass='postgres',
-                            Engine='db.m1.small',
+                            Engine='postgres',
+                            DBInstanceClass='db.m1.small',
                             MasterUsername='root',
                             MasterUserPassword='hunter2',
                             Port=1234,
@@ -156,10 +156,16 @@ def test_delete_database():
     instances = conn.describe_db_instances()
     list(instances['DBInstances']).should.have.length_of(1)
 
-    conn.delete_db_instance(DBInstanceIdentifier="db-master-1")
+    conn.delete_db_instance(DBInstanceIdentifier="db-primary-1",
+                            FinalDBSnapshotIdentifier='primary-1-snapshot')
+
     instances = conn.describe_db_instances()
     list(instances['DBInstances']).should.have.length_of(0)
 
+    # Saved the snapshot
+    snapshots = conn.describe_db_snapshots(DBInstanceIdentifier="db-primary-1").get('DBSnapshots')
+    snapshots[0].get('Engine').should.equal('postgres')
+
 
 @mock_rds2
 def test_delete_non_existant_database():