diff --git a/client/client.go b/client/client.go
index 11796b6..0070b65 100644
--- a/client/client.go
+++ b/client/client.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"os"
 	"strings"
 )
 
@@ -19,9 +20,13 @@ type Client struct {
 }
 
 func New(apiKey string) *Client {
+	baseURL := "https://customer.cloudamqp.com/api"
+	if envURL := os.Getenv("CLOUDAMQP_URL"); envURL != "" {
+		baseURL = envURL
+	}
 	return &Client{
 		apiKey:     apiKey,
-		baseURL:    "https://customer.cloudamqp.com/api",
+		baseURL:    baseURL,
 		httpClient: &http.Client{},
 	}
 }
diff --git a/client/client_test.go b/client/client_test.go
index 3bc7706..c82b7fe 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -18,6 +19,31 @@ func TestNew(t *testing.T) {
 	assert.NotNil(t, client.httpClient)
 }
 
+func TestNew_WithEnvironmentVariable(t *testing.T) {
+	// Save original environment variable
+	originalURL := os.Getenv("CLOUDAMQP_URL")
+	defer os.Setenv("CLOUDAMQP_URL", originalURL)
+
+	// Test with custom base URL from environment variable
+	customURL := "https://custom.example.com/api"
+	os.Setenv("CLOUDAMQP_URL", customURL)
+
+	apiKey := "test-api-key"
+	client := New(apiKey)
+
+	assert.NotNil(t, client)
+	assert.Equal(t, apiKey, client.apiKey)
+	assert.Equal(t, customURL, client.baseURL)
+	assert.NotNil(t, client.httpClient)
+
+	// Test with empty environment variable (should use default)
+	os.Setenv("CLOUDAMQP_URL", "")
+	client = New(apiKey)
+
+	assert.NotNil(t, client)
+	assert.Equal(t, "https://customer.cloudamqp.com/api", client.baseURL)
+}
+
 func TestMakeRequest_GET_Success(t *testing.T) {
 	// Mock server
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {