diff --git a/src/main/java/net/datafaker/providers/base/Address.java b/src/main/java/net/datafaker/providers/base/Address.java
index b035b47b3..1c9b1ea82 100644
--- a/src/main/java/net/datafaker/providers/base/Address.java
+++ b/src/main/java/net/datafaker/providers/base/Address.java
@@ -15,7 +15,7 @@ public String streetName() {
     }
 
     public String streetAddressNumber() {
-        return String.valueOf(faker.random().nextInt(1000));
+        return String.valueOf(faker.random().nextInt(1, 1000));
     }
 
     public String streetAddress() {
@@ -23,7 +23,7 @@ public String streetAddress() {
     }
 
     public String streetAddress(boolean includeSecondary) {
-        String streetAddress = resolve("address.street_address");
+        String streetAddress = streetAddress();
         if (includeSecondary) {
             streetAddress = streetAddress + " " + secondaryAddress();
         }
diff --git a/src/test/java/net/datafaker/providers/base/AddressTest.java b/src/test/java/net/datafaker/providers/base/AddressTest.java
index 30a5c45ca..096a7b5d6 100644
--- a/src/test/java/net/datafaker/providers/base/AddressTest.java
+++ b/src/test/java/net/datafaker/providers/base/AddressTest.java
@@ -69,14 +69,14 @@ void testCyrillicStreetName(String cyrillicLocale) {
 
     @Test
     void testStreetAddressStartsWithNumber() {
-        final String streetAddressNumber = faker.address().streetAddress();
-        assertThat(streetAddressNumber).matches("[0-9]+ .+");
+        final String streetAddress = faker.address().streetAddress();
+        assertThat(streetAddress).matches("[0-9]+ .+");
     }
 
     @Test
-    void testStreetAddressIsANumber() {
+    void testStreetAddressNumberIsANumberGreaterZero() {
         final String streetAddressNumber = faker.address().streetAddressNumber();
-        assertThat(streetAddressNumber).matches("[0-9]+");
+        assertThat(streetAddressNumber).matches("[1-9][0-9]*");
     }
 
     @Test