@@ -219,7 +219,9 @@ def rescale(self, units=None, dtype=None):
                 'Unable to convert between units of "%s" and "%s"'
                 %(from_u._dimensionality, to_u._dimensionality)
             )
-        return Quantity(cf*self.magnitude, to_u, dtype=dtype)
+        new_magnitude = cf*self.magnitude
+        dtype = np.result_type(dtype, new_magnitude)
+        return Quantity(new_magnitude, to_u, dtype=dtype)
 
     def rescale_preferred(self):
         """
 
@@ -1,4 +1,5 @@
 import unittest
+import numpy as np
 from .. import units as pq
 from .. import quantity
 from .common import TestCase
@@ -15,15 +16,15 @@ def test_inplace_conversion(self):
     def test_rescale(self):
         for u in ('ft', 'feet', pq.ft):
             self.assertQuantityEqual((10*pq.m).rescale(u), 32.80839895 * pq.ft)
-            
+
     def test_rescale_preferred(self):
         quantity.PREFERRED = [pq.mV, pq.pA]
         q = 10*pq.V
         self.assertQuantityEqual(q.rescale_preferred(), q.rescale(pq.mV))
         q = 5*pq.A
         self.assertQuantityEqual(q.rescale_preferred(), q.rescale(pq.pA))
         quantity.PREFERRED = []
-    
+
     def test_rescale_preferred_failure(self):
         quantity.PREFERRED = [pq.pA]
         q = 10*pq.V
@@ -34,15 +35,15 @@ def test_rescale_preferred_failure(self):
         else:
             self.assertTrue(False)
         quantity.PREFERRED = []
-    
+
     def test_rescale_noargs(self):
         quantity.PREFERRED = [pq.mV, pq.pA]
         q = 10*pq.V
         self.assertQuantityEqual(q.rescale(), q.rescale(pq.mV))
         q = 5*pq.A
         self.assertQuantityEqual(q.rescale(), q.rescale(pq.pA))
         quantity.PREFERRED = []
-    
+
     def test_rescale_noargs_failure(self):
         quantity.PREFERRED = [pq.pA]
         q = 10*pq.V
 
@@ -188,7 +188,7 @@ def test_argmin(self):
     def test_nanargmax(self):
         q = np.append(self.q, np.nan) * self.q.units
         self.assertEqual(self.q.nanargmin(), 0)
-        
+
     def test_ptp(self):
         self.methodWithOut('ptp', 3 * pq.m)
         self.methodWithOut('ptp', [2, 2] * pq.m, axis=0)
@@ -248,7 +248,7 @@ def test_mean(self):
         self.methodWithOut('mean', [1.5, 3.5] * pq.m, axis=1)
 
     def test_nanmean(self):
-        import numpy as np    
+        import numpy as np
         q = [[1,2], [3,4], [np.nan,np.nan]] * pq.m
         self.assertQuantityEqual(q.nanmean(), self.q.mean())
 
@@ -263,7 +263,7 @@ def test_std(self):
         self.methodWithOut('std', [0.5, 0.5] * pq.m, axis=1)
 
     def test_nanstd(self):
-        import numpy as np    
+        import numpy as np
         q0 = [[1,2], [3,4]] * pq.m
         q1 = [[1,2], [3,4], [np.nan,np.nan]] * pq.m
         self.assertQuantityEqual(q0.std(), q1.nanstd())
@@ -345,3 +345,10 @@ def test_setitem (self):
     def test_iterator(self):
         for q in self.q.flatten():
             self.assertQuantityEqual(q.units, pq.m)
+
+    def test_rescale_integer_argument(self):
+        from .. import Quantity
+        self.assertQuantityEqual(
+            Quantity(10, pq.deg).rescale(pq.rad),
+            np.pi/18*pq.rad
+        )