diff --git a/experiment/fbmessenger/fbmessenger_test.go b/experiment/fbmessenger/fbmessenger_test.go
index f6083057..be067d36 100644
--- a/experiment/fbmessenger/fbmessenger_test.go
+++ b/experiment/fbmessenger/fbmessenger_test.go
@@ -217,7 +217,7 @@ func newsession(t *testing.T) model.ExperimentSession {
 	sess, err := engine.NewSession(engine.SessionConfig{
 		AssetsDir: "../../testdata",
 		AvailableProbeServices: []model.Service{{
-			Address: "https://ams-pg.ooni.org",
+			Address: "https://ams-pg-test.ooni.org",
 			Type:    "https",
 		}},
 		Logger: log.Log,
diff --git a/experiment/hhfm/hhfm_test.go b/experiment/hhfm/hhfm_test.go
index 5d302c9c..05ab915d 100644
--- a/experiment/hhfm/hhfm_test.go
+++ b/experiment/hhfm/hhfm_test.go
@@ -554,7 +554,7 @@ func newsession(t *testing.T) model.ExperimentSession {
 	sess, err := engine.NewSession(engine.SessionConfig{
 		AssetsDir: "../../testdata",
 		AvailableProbeServices: []model.Service{{
-			Address: "https://ams-pg.ooni.org",
+			Address: "https://ams-pg-test.ooni.org",
 			Type:    "https",
 		}},
 		Logger: log.Log,
diff --git a/experiment/webconnectivity/webconnectivity_test.go b/experiment/webconnectivity/webconnectivity_test.go
index 2b32ca94..2a633ae1 100644
--- a/experiment/webconnectivity/webconnectivity_test.go
+++ b/experiment/webconnectivity/webconnectivity_test.go
@@ -227,7 +227,7 @@ func newsession(t *testing.T, lookupBackends bool) model.ExperimentSession {
 	sess, err := engine.NewSession(engine.SessionConfig{
 		AssetsDir: "../../testdata",
 		AvailableProbeServices: []model.Service{{
-			Address: "https://ams-pg.ooni.org",
+			Address: "https://ams-pg-test.ooni.org",
 			Type:    "https",
 		}},
 		Logger: log.Log,
diff --git a/internal/mockable/mockable.go b/internal/mockable/mockable.go
index 270ed5a1..ba9c9e87 100644
--- a/internal/mockable/mockable.go
+++ b/internal/mockable/mockable.go
@@ -87,7 +87,7 @@ func (sess *Session) NewOrchestraClient(ctx context.Context) (model.ExperimentOr
 		return nil, sess.MockableOrchestraClientError
 	}
 	clnt, err := probeservices.NewClient(sess, model.Service{
-		Address: "https://ams-pg.ooni.org/",
+		Address: "https://ams-pg-test.ooni.org/",
 		Type:    "https",
 	})
 	runtimex.PanicOnError(err, "orchestra.NewClient should not fail here")
diff --git a/oonimkall/session_integration_test.go b/oonimkall/session_integration_test.go
index 3b8e2c1f..f1e23429 100644
--- a/oonimkall/session_integration_test.go
+++ b/oonimkall/session_integration_test.go
@@ -18,7 +18,7 @@ import (
 func NewSessionWithAssetsDir(assetsDir string) (*oonimkall.Session, error) {
 	return oonimkall.NewSession(&oonimkall.SessionConfig{
 		AssetsDir:        assetsDir,
-		ProbeServicesURL: "https://ams-pg.ooni.org/",
+		ProbeServicesURL: "https://ams-pg-test.ooni.org/",
 		SoftwareName:     "oonimkall-test",
 		SoftwareVersion:  "0.1.0",
 		StateDir:         "../testdata/oonimkall/state",
diff --git a/probeservices/probeservices_test.go b/probeservices/probeservices_test.go
index 16275d17..966cad06 100644
--- a/probeservices/probeservices_test.go
+++ b/probeservices/probeservices_test.go
@@ -26,7 +26,7 @@ func newclient() *probeservices.Client {
 			MockableLogger:     log.Log,
 		},
 		model.Service{
-			Address: "https://ams-pg.ooni.org/",
+			Address: "https://ams-pg-test.ooni.org/",
 			Type:    "https",
 		},
 	)
diff --git a/probeservices/urls_test.go b/probeservices/urls_test.go
index 427f5884..82e1cb76 100644
--- a/probeservices/urls_test.go
+++ b/probeservices/urls_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestFetchURLListSuccess(t *testing.T) {
 	client := newclient()
-	client.BaseURL = "https://ams-pg.ooni.org"
+	client.BaseURL = "https://ams-pg-test.ooni.org"
 	config := model.URLListConfig{
 		Categories:  []string{"NEWS", "CULTR"},
 		CountryCode: "IT",
diff --git a/session_integration_test.go b/session_integration_test.go
index 94bf7cfb..024b793b 100644
--- a/session_integration_test.go
+++ b/session_integration_test.go
@@ -79,7 +79,7 @@ func TestSessionTorArgsTorBinary(t *testing.T) {
 	sess, err := NewSession(SessionConfig{
 		AssetsDir: "testdata",
 		AvailableProbeServices: []model.Service{{
-			Address: "https://ams-pg.ooni.org",
+			Address: "https://ams-pg-test.ooni.org",
 			Type:    "https",
 		}},
 		Logger: log.Log,
@@ -117,7 +117,7 @@ func newSessionForTestingNoLookupsWithProxyURL(t *testing.T, URL *url.URL) *Sess
 	sess, err := NewSession(SessionConfig{
 		AssetsDir: "testdata",
 		AvailableProbeServices: []model.Service{{
-			Address: "https://ams-pg.ooni.org",
+			Address: "https://ams-pg-test.ooni.org",
 			Type:    "https",
 		}},
 		Logger: log.Log,
@@ -190,7 +190,7 @@ func TestInitOrchestraClientMaybeRegisterError(t *testing.T) {
 	sess := newSessionForTestingNoLookups(t)
 	defer sess.Close()
 	clnt, err := probeservices.NewClient(sess, model.Service{
-		Address: "https://ams-pg.ooni.org/",
+		Address: "https://ams-pg-test.ooni.org/",
 		Type:    "https",
 	})
 	if err != nil {
@@ -215,7 +215,7 @@ func TestInitOrchestraClientMaybeLoginError(t *testing.T) {
 	sess := newSessionForTestingNoLookups(t)
 	defer sess.Close()
 	clnt, err := probeservices.NewClient(sess, model.Service{
-		Address: "https://ams-pg.ooni.org/",
+		Address: "https://ams-pg-test.ooni.org/",
 		Type:    "https",
 	})
 	if err != nil {