diff --git a/src/Model/ZoneMemberCountry.php b/src/Model/ZoneMemberCountry.php
index 29c8812..664ca89 100644
--- a/src/Model/ZoneMemberCountry.php
+++ b/src/Model/ZoneMemberCountry.php
@@ -3,7 +3,7 @@
 namespace CommerceGuys\Zone\Model;
 
 use CommerceGuys\Addressing\AddressInterface;
-use CommerceGuys\Zone\PostalCodeHelper;
+use CommerceGuys\Addressing\PostalCodeHelper;
 
 /**
  * Matches a country, its subdivisions and postal codes.
diff --git a/src/PostalCodeHelper.php b/src/PostalCodeHelper.php
deleted file mode 100644
index 486ac16..0000000
--- a/src/PostalCodeHelper.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace CommerceGuys\Zone;
-
-/**
- * Provides helpers for matching postal codes.
- */
-class PostalCodeHelper
-{
-    /**
-     * Checks whether the provided postal code matches the provided rules.
-     *
-     * @param string $postalCode  The postal code.
-     * @param string $includeRule The rule for included postal codes.
-     * @param string $excludeRule (Optional) The rule for excluded postal codes.
-     *
-     * @return bool True if the provided postal code matches the provided
-     *              rules, false otherwise.
-     */
-    public static function match($postalCode, $includeRule, $excludeRule = '')
-    {
-        $matchIncluded = true;
-        if ($includeRule) {
-            $matchIncluded = self::matchRule($postalCode, $includeRule);
-        }
-        $matchExcluded = false;
-        if ($excludeRule) {
-            $matchExcluded = self::matchRule($postalCode, $excludeRule);
-        }
-
-        return $matchIncluded && !$matchExcluded;
-    }
-
-    /**
-     * Checks whether the provided postal code matches the provided rule.
-     *
-     * @param string $postalCode The postal code.
-     * @param string $rule       The rule. Can be a regular expression
-     *                           ("/(35|38)[0-9]{3}/") or comma-separated list,
-     *                            including ranges ("98, 100:200, 250").
-     *
-     * @return bool True if the provided postal code matches the provided
-     *              rules, false otherwise.
-     */
-    protected static function matchRule($postalCode, $rule)
-    {
-        if (substr($rule, 0, 1) == '/' && substr($rule, -1, 1) == '/') {
-            $match = preg_match($rule, $postalCode);
-        } else {
-            $match = in_array($postalCode, self::buildList($rule));
-        }
-
-        return $match;
-    }
-
-    /**
-     * Builds a list of postal codes from the provided string.
-     *
-     * Expands any ranges into full values (e.g. "1:3" becomes "1, 2, 3").
-     *
-     * @param string $postalCodes The postal codes.
-     *
-     * @return array The list of postal codes.
-     */
-    protected static function buildList($postalCodes)
-    {
-        $postalCodeList = explode(',', $postalCodes);
-        foreach ($postalCodeList as $index => &$postalCodeItem) {
-            $postalCodeItem = trim($postalCodeItem);
-            if (strpos($postalCodeItem, ':') !== false) {
-                $postalCodeRange = explode(':', $postalCodeItem);
-                if (is_numeric($postalCodeRange[0]) && is_numeric($postalCodeRange[1])) {
-                    $postalCodeRange = range($postalCodeRange[0], $postalCodeRange[1]);
-                    $postalCodeList = array_merge($postalCodeList, $postalCodeRange);
-                }
-                unset($postalCodeList[$index]);
-            }
-        }
-
-        return $postalCodeList;
-    }
-}
diff --git a/tests/Model/ZoneMemberCountryTest.php b/tests/Model/ZoneMemberCountryTest.php
index 4d23947..30d2b59 100755
--- a/tests/Model/ZoneMemberCountryTest.php
+++ b/tests/Model/ZoneMemberCountryTest.php
@@ -106,7 +106,7 @@ public function testExcludedPostalCodes()
      * @uses \CommerceGuys\Zone\Model\ZoneMemberCountry::setDependentLocality
      * @uses \CommerceGuys\Zone\Model\ZoneMemberCountry::setIncludedPostalCodes
      * @uses \CommerceGuys\Zone\Model\ZoneMemberCountry::setExcludedPostalCodes
-     * @uses \CommerceGuys\Zone\PostalCodeHelper
+     * @uses \CommerceGuys\Addressing\PostalCodeHelper
      * @dataProvider addressProvider
      */
     public function testMatch($address, $expectedResult)
diff --git a/tests/PostalCodeHelperTest.php b/tests/PostalCodeHelperTest.php
deleted file mode 100755
index 837594a..0000000
--- a/tests/PostalCodeHelperTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace CommerceGuys\Zone\Tests;
-
-use CommerceGuys\Zone\PostalCodeHelper;
-
-/**
- * @coversDefaultClass \CommerceGuys\Zone\PostalCodeHelper
- */
-class PostalCodeHelperTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers ::match
-     * @covers ::matchRule
-     * @covers ::buildList
-     */
-    public function testMatch()
-    {
-        // Test empty rules.
-        $this->assertEquals(true, PostalCodeHelper::match('123', null, null));
-
-        // Test regular expressions.
-        $includeRule = '/(20)[0-9]{1}/';
-        $excludeRule = '/(20)[0-2]{1}/';
-        $this->assertEquals(true, PostalCodeHelper::match('203', $includeRule, $excludeRule));
-        $this->assertEquals(false, PostalCodeHelper::match('202', $includeRule, $excludeRule));
-
-        // Test lists
-        $includeRule = '10, 20, 30:40';
-        $excludeRule = '35';
-        $this->assertEquals(true, PostalCodeHelper::match('34', $includeRule, $excludeRule));
-        $this->assertEquals(false, PostalCodeHelper::match('35', $includeRule, $excludeRule));
-    }
-
-    /**
-     * Returns a mock address with the provided postal code.
-     *
-     * @param string $postalCode The postal code.
-     *
-     * @return \CommerceGuys\Addressing\Address
-     */
-    protected function getAddress($postalCode = null)
-    {
-        $address = $this
-            ->getMockBuilder('CommerceGuys\Addressing\Address')
-            ->getMock();
-        if ($postalCode) {
-            $address
-                ->expects($this->any())
-                ->method('getPostalCode')
-                ->will($this->returnValue($postalCode));
-        }
-
-        return $address;
-    }
-}
diff --git a/tests/Repository/ZoneRepositoryTest.php b/tests/Repository/ZoneRepositoryTest.php
index e4d0d84..65ac558 100644
--- a/tests/Repository/ZoneRepositoryTest.php
+++ b/tests/Repository/ZoneRepositoryTest.php
@@ -92,7 +92,7 @@ public function testConstructor()
      * @uses \CommerceGuys\Zone\Model\ZoneMember
      * @uses \CommerceGuys\Zone\Model\ZoneMemberCountry
      * @uses \CommerceGuys\Zone\Model\ZoneMemberZone
-     * @uses \CommerceGuys\Zone\PostalCodeHelper
+     * @uses \CommerceGuys\Addressing\PostalCodeHelper
      * @depends testConstructor
      */
     public function testGet($zoneRepository)
@@ -153,7 +153,7 @@ public function testGetNonExistingZone($zoneRepository)
      * @uses \CommerceGuys\Zone\Model\ZoneMember
      * @uses \CommerceGuys\Zone\Model\ZoneMemberCountry
      * @uses \CommerceGuys\Zone\Model\ZoneMemberZone
-     * @uses \CommerceGuys\Zone\PostalCodeHelper
+     * @uses \CommerceGuys\Addressing\PostalCodeHelper
      * @depends testConstructor
      */
     public function testGetAll($zoneRepository)