diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go
index 9f5e25de0e..bab230afbc 100644
--- a/cmd/swarm/swarm-smoke/main.go
+++ b/cmd/swarm/swarm-smoke/main.go
@@ -17,7 +17,6 @@
 package main
 
 import (
-	"fmt"
 	"os"
 	"sort"
 
@@ -29,16 +28,13 @@ import (
 
 var (
 	endpoints []string
-	endpoint  string
+	cluster   string
+	scheme    string
 	filesize  int
+	from      int
+	to        int
 )
 
-func init() {
-	for port := 8501; port <= 8512; port++ {
-		endpoints = append(endpoints, fmt.Sprintf("http://%v.testing.swarm-gateways.net", port))
-	}
-}
-
 func main() {
 	log.PrintOrigins(true)
 	log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true))))
@@ -49,10 +45,28 @@ func main() {
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
-			Name:        "bzz-api",
-			Value:       endpoints[0],
-			Usage:       "upload node endpoint",
-			Destination: &endpoint,
+			Name:        "cluster-endpoint",
+			Value:       "testing",
+			Usage:       "cluster to point to (open, or testing)",
+			Destination: &cluster,
+		},
+		cli.IntFlag{
+			Name:        "cluster-from",
+			Value:       8501,
+			Usage:       "swarm node (from)",
+			Destination: &from,
+		},
+		cli.IntFlag{
+			Name:        "cluster-to",
+			Value:       8512,
+			Usage:       "swarm node (to)",
+			Destination: &to,
+		},
+		cli.StringFlag{
+			Name:        "cluster-scheme",
+			Value:       "http",
+			Usage:       "http or https",
+			Destination: &scheme,
 		},
 		cli.IntFlag{
 			Name:        "filesize",
diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go
index b490098809..d5ddb69c16 100644
--- a/cmd/swarm/swarm-smoke/upload_and_sync.go
+++ b/cmd/swarm/swarm-smoke/upload_and_sync.go
@@ -20,10 +20,18 @@ import (
 	cli "gopkg.in/urfave/cli.v1"
 )
 
+func generateEndpoints(scheme string, cluster string, from int, to int) {
+	for port := from; port <= to; port++ {
+		endpoints = append(endpoints, fmt.Sprintf("%s://%v.%s.swarm-gateways.net", scheme, port, cluster))
+	}
+}
+
 func cliUploadAndSync(c *cli.Context) error {
 	defer func(now time.Time) { log.Info("total time", "time", time.Since(now), "size", filesize) }(time.Now())
 
-	log.Info("uploading and syncing")
+	generateEndpoints(scheme, cluster, from, to)
+
+	log.Info("uploading to " + endpoints[0] + " and syncing")
 
 	f, cleanup := generateRandomFile(filesize * 1000000)
 	defer cleanup()