diff --git a/awslimitchecker/services/ebs.py b/awslimitchecker/services/ebs.py
index dcb25bf0..7a9472ca 100644
--- a/awslimitchecker/services/ebs.py
+++ b/awslimitchecker/services/ebs.py
@@ -233,7 +233,7 @@ def _get_limits_ebs(self):
             self.critical_threshold,
             limit_type='AWS::EC2::Volume',
             limit_subtype='io1',
-            quotas_name='Storage for Provisioned IOPS SSD (io1) volumes',
+            quotas_name='Storage for Provisioned IOPS SSD (io1) volumes, in tib',
             quotas_unit='GiB',
             quotas_unit_converter=convert_TiB_to_GiB
         )
@@ -255,7 +255,7 @@ def _get_limits_ebs(self):
             self.critical_threshold,
             limit_type='AWS::EC2::Volume',
             limit_subtype='io2',
-            quotas_name='Storage for Provisioned IOPS SSD (io2) volumes',
+            quotas_name='Storage for Provisioned IOPS SSD (io2) volumes, in tib',
             quotas_unit='GiB',
             quotas_unit_converter=convert_TiB_to_GiB
         )
@@ -268,7 +268,7 @@ def _get_limits_ebs(self):
             limit_type='AWS::EC2::Volume',
             limit_subtype='gp2',
             ta_limit_name='General Purpose SSD (gp2) volume storage (GiB)',
-            quotas_name='Storage for General Purpose SSD (gp2) volumes',
+            quotas_name='Storage for General Purpose SSD (gp2) volumes, in tib',
             quotas_unit='GiB',
             quotas_unit_converter=convert_TiB_to_GiB
         )
@@ -281,7 +281,7 @@ def _get_limits_ebs(self):
             limit_type='AWS::EC2::Volume',
             limit_subtype='gp3',
             ta_limit_name='General Purpose SSD (gp3) volume storage (GiB)',
-            quotas_name='Storage for General Purpose SSD (gp3) volumes',
+            quotas_name='Storage for General Purpose SSD (gp3) volumes, in tib',
             quotas_unit='GiB',
             quotas_unit_converter=convert_TiB_to_GiB
         )
@@ -294,7 +294,7 @@ def _get_limits_ebs(self):
             limit_type='AWS::EC2::Volume',
             limit_subtype='standard',
             ta_limit_name='Magnetic (standard) volume storage (GiB)',
-            quotas_name='Storage for Magnetic (standard) volumes',
+            quotas_name='Storage for Magnetic (standard) volumes, in tib',
             quotas_unit='GiB',
             quotas_unit_converter=convert_TiB_to_GiB
         )
@@ -306,7 +306,7 @@ def _get_limits_ebs(self):
             self.critical_threshold,
             limit_type='AWS::EC2::Volume',
             limit_subtype='st1',
-            quotas_name='Storage for Throughput Optimized HDD (st1) volumes',
+            quotas_name='Storage for Throughput Optimized HDD (st1) volumes, in tib',
             quotas_unit='GiB',
             quotas_unit_converter=convert_TiB_to_GiB
         )
@@ -318,7 +318,7 @@ def _get_limits_ebs(self):
             self.critical_threshold,
             limit_type='AWS::EC2::Volume',
             limit_subtype='sc1',
-            quotas_name='Storage for Cold HDD (sc1) volumes',
+            quotas_name='Storage for Cold HDD (sc1) volumes, in tib',
             quotas_unit='GiB',
             quotas_unit_converter=convert_TiB_to_GiB
         )
diff --git a/awslimitchecker/tests/services/test_ebs.py b/awslimitchecker/tests/services/test_ebs.py
index e59bcffa..f4b39bf0 100644
--- a/awslimitchecker/tests/services/test_ebs.py
+++ b/awslimitchecker/tests/services/test_ebs.py
@@ -41,6 +41,7 @@
 from awslimitchecker.services.ebs import _EbsService, convert_TiB_to_GiB
 from awslimitchecker.limit import AwsLimit
 from awslimitchecker.tests.services import result_fixtures
+from awslimitchecker import AwsLimitChecker
 
 # https://code.google.com/p/mock/issues/detail?id=249
 # py>=3.4 should use unittest.mock not the mock package on pypi
@@ -256,3 +257,15 @@ def test_required_iam_permissions(self):
             "ec2:DescribeVolumes",
             "ec2:DescribeSnapshots"
         ]
+
+    def find_quota_ebs(self):
+        cls = AwsLimitChecker("us-east-1")
+        limits = cls.get_limits(["EBS"])
+        assert limits["EBS"]["Cold (HDD) volume storage (GiB)"].quotas_limit != None
+        assert limits["EBS"]["Throughput Optimized (HDD) volume storage (GiB)"].quotas_limit != None
+        assert limits["EBS"]["Provisioned IOPS SSD (io1) storage (GiB)"].quotas_limit != None
+        assert limits["EBS"]["Provisioned IOPS SSD (io2) storage (GiB)"].quotas_limit != None
+        assert limits["EBS"]["General Purpose (SSD gp2) volume storage (GiB)"].quotas_limit != None
+        assert limits["EBS"]["General Purpose (SSD gp3) volume storage (GiB)"].quotas_limit != None
+        assert limits["EBS"]["Magnetic volume storage (GiB)"].quotas_limit != None
+