diff --git a/core-test/src/test/scala/org/bitcoins/core/protocol/AddressTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/AddressTest.scala
index 350b797ae3..1d5370a375 100644
--- a/core-test/src/test/scala/org/bitcoins/core/protocol/AddressTest.scala
+++ b/core-test/src/test/scala/org/bitcoins/core/protocol/AddressTest.scala
@@ -30,4 +30,10 @@ class AddressTest extends BitcoinSUnitTest {
     TestUtil.bech32Address.toString must be(
       "bcrt1qq6w6pu6zq90az9krn53zlkvgyzkyeglzukyepf")
   }
+
+  it must "calculate the correct descriptor" in {
+    forAll(AddressGenerator.address) { addr =>
+      assert(addr.descriptor == s"addr(${addr.value})")
+    }
+  }
 }
diff --git a/core/src/main/scala/org/bitcoins/core/protocol/Address.scala b/core/src/main/scala/org/bitcoins/core/protocol/Address.scala
index 94b9d0631c..e8130ebbbf 100644
--- a/core/src/main/scala/org/bitcoins/core/protocol/Address.scala
+++ b/core/src/main/scala/org/bitcoins/core/protocol/Address.scala
@@ -33,6 +33,8 @@ sealed abstract class Address {
   def scriptPubKey: ScriptPubKey
 
   override def toString: String = value
+
+  def descriptor: String = s"addr($value)"
 }
 
 sealed abstract class BitcoinAddress extends Address