@@ -0,0 +1,15 @@
+from ...extern.six.moves import cPickle as pickle
+from ...coordinates import Longitude
+
+def test_basic():
+    lon1 = Longitude(1.23, "radian", wrap_angle='180d')
+    s = pickle.dumps(lon1)
+    lon2 = pickle.loads(s)
+
+def test_pickle_longitude_wrap_angle():
+    a = Longitude(1.23, "radian", wrap_angle='180d')
+    s = pickle.dumps(a)
+    b = pickle.loads(s)
+
+    assert a.rad == b.rad
+    assert a.wrap_angle == b.wrap_angle
@@ -394,20 +394,17 @@ def __reduce__(self):
         # patch to pickle Quantity objects (ndarray subclasses),
         # see http://www.mail-archive.com/[email protected]/msg02446.html
 
-        object_state = list(np.ndarray.__reduce__(self))
-        subclass_state = (self._unit,)
-        object_state[2] = (object_state[2], subclass_state)
+        object_state = list(super(Quantity, self).__reduce__())
+        object_state[2] = (object_state[2], self.__dict__)
         return tuple(object_state)
 
     def __setstate__(self, state):
         # patch to unpickle Quantity objects (ndarray subclasses),
         # see http://www.mail-archive.com/[email protected]/msg02446.html
 
         nd_state, own_state = state
-        np.ndarray.__setstate__(self, nd_state)
-
-        unit, = own_state
-        self._unit = unit
+        super(Quantity, self).__setstate__(nd_state)
+        self.__dict__.update(own_state)
 
     def to(self, unit, equivalencies=[]):
         """ Returns a new `Quantity` object with the specified units.