diff --git a/lib/fog/aws/requests/ec2/describe_instances.rb b/lib/fog/aws/requests/ec2/describe_instances.rb
index d8ceb2698..d6ac2a10c 100644
--- a/lib/fog/aws/requests/ec2/describe_instances.rb
+++ b/lib/fog/aws/requests/ec2/describe_instances.rb
@@ -93,7 +93,7 @@ module Fog
                   @data[:deleted_at].delete(instance['instanceId'])
                   @data[:instances].delete(instance['instanceId'])
                 elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
-                  instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
+                  instance['instanceState'] = { 'code' => 48, 'name' => 'terminating' }
                 end
               when 'terminating'
                 if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
diff --git a/lib/fog/aws/requests/ec2/terminate_instances.rb b/lib/fog/aws/requests/ec2/terminate_instances.rb
index cc2c9b72d..9888c56da 100644
--- a/lib/fog/aws/requests/ec2/terminate_instances.rb
+++ b/lib/fog/aws/requests/ec2/terminate_instances.rb
@@ -55,9 +55,11 @@ module Fog
               when 'shutting-down'
                 32
               when 'terminated'
+                48
+              when 'stopping'
                 64
-              when 'rebooting'
-                128
+              when 'stopped'
+                80
               end
               state = { 'name' => 'shutting-down', 'code' => 32}
               response.body['instancesSet'] << {