diff -up pyparted-3.9.1/src/parted/__init__.py.orig pyparted-3.9.1/src/parted/__init__.py
--- pyparted-3.9.1/src/parted/__init__.py.orig	2013-09-03 11:27:51.000000000 -0400
+++ pyparted-3.9.1/src/parted/__init__.py	2013-09-09 13:38:22.525766774 -0400
@@ -313,9 +313,9 @@ def Deprecated(mod, deprecated={}):
 __archLabels = (('amiga', 'ppc(64)?$'),
                 ('bsd', 'alpha$'),
                 ('dasd', 's390x?$'),
-                ('gpt', 'i[3-6]86$|x86_64$|ia64$|ppc(64)?$'),
+                ('gpt', 'i[3-6]86$|x86_64$|ia64$|ppc(64)?$|armv7l$'),
                 ('mac', 'ppc(64)?$'),
-                ('msdos', 'i[3-6]86$|x86_64$|s390x?$|alpha$|ia64$|ppc(64)?$'),
+                ('msdos', 'i[3-6]86$|x86_64$|s390x?$|alpha$|ia64$|ppc(64)?$|armv7l$'),
                 ('sun', 'sparc(64)?$'))
 
 def getLabels(arch=None):
diff -up pyparted-3.9.1/tests/test_parted_parted.py.orig pyparted-3.9.1/tests/test_parted_parted.py
--- pyparted-3.9.1/tests/test_parted_parted.py.orig	2013-09-03 11:27:51.000000000 -0400
+++ pyparted-3.9.1/tests/test_parted_parted.py	2013-09-09 13:38:00.338766774 -0400
@@ -59,6 +59,7 @@ class GetLabelsTestCase(unittest.TestCas
         self.assertSetEqual(parted.getLabels('ppc64'), {'amiga', 'gpt', 'mac', 'msdos'})
         self.assertSetEqual(parted.getLabels('alpha'), {'bsd', 'msdos'})
         self.assertSetEqual(parted.getLabels('ia64'), {'gpt', 'msdos'})
+        self.assertSetEqual(parted.getLabels('armv7l'), {'gpt', 'msdos'})
 
 class GetDeviceTestCase(RequiresDeviceNode):
     def runTest(self):
diff -up pyparted-3.9.1/tests/test__ped_ped.py.orig pyparted-3.9.1/tests/test__ped_ped.py
--- pyparted-3.9.1/tests/test__ped_ped.py.orig	2013-09-03 11:27:51.000000000 -0400
+++ pyparted-3.9.1/tests/test__ped_ped.py	2013-09-09 13:29:51.028766774 -0400
@@ -203,14 +203,18 @@ class DeviceGetNextTestCase(unittest.Tes
         _ped.device_probe_all()
         lst = self.getDeviceList(_ped.device_get_next)
 
-        # Now the test cases.
-        self.assertGreater(len(lst), 0)
-        self.assertRaises(TypeError, _ped.device_get_next, None)
+        # Now the test cases.  This only works if we get any devices back,
+        # which may not be possible depending on what is executing the test
+        # cases.  Automated build systems may not provide this functionality,
+        # so just skip the tests that do not matter when there are no
+        # devices returned.
+        if len(lst) > 0:
+            self.assertRaises(TypeError, _ped.device_get_next, None)
 
-        for ele in lst:
-            self.assertTrue(isinstance(ele, _ped.Device))
+            for ele in lst:
+                self.assertTrue(isinstance(ele, _ped.Device))
 
-        self.assertRaises(IndexError, _ped.device_get_next, lst[-1])
+            self.assertRaises(IndexError, _ped.device_get_next, lst[-1])
 
 class DeviceProbeAllTestCase(RequiresDevice, BuildList):
     def runTest(self):