diff --git a/Makefile b/Makefile
index c2bcc121d..e2e87723f 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,6 @@ endif
 	docker run --name memcached -p "11211:11211" -d memcached
 	docker run --name postgres -p "5432:5432" -d postgres
 	docker run --name rabbitmq -p "15672:15672" -p "5672:5672" -d rabbitmq:3-management
-	docker run --name opentsdb -p "4242:4242" -d petergrace/opentsdb-docker
 	docker run --name redis -p "6379:6379" -d redis
 	docker run --name aerospike -p "3000:3000" -d aerospike
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
@@ -79,7 +78,6 @@ docker-run-circle:
 		-e ADVERTISED_PORT=9092 \
 		-p "2181:2181" -p "9092:9092" \
 		-d spotify/kafka
-	docker run --name opentsdb -p "4242:4242" -d petergrace/opentsdb-docker
 	docker run --name aerospike -p "3000:3000" -d aerospike
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 	docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
@@ -88,8 +86,8 @@ docker-run-circle:
 
 # Kill all docker containers, ignore errors
 docker-kill:
-	-docker kill nsq aerospike redis opentsdb rabbitmq postgres memcached mysql kafka mqtt riemann snmp
-	-docker rm nsq aerospike redis opentsdb rabbitmq postgres memcached mysql kafka mqtt riemann snmp
+	-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp
+	-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp
 
 # Run full unit tests using docker containers (includes setup and teardown)
 test: vet docker-kill docker-run
diff --git a/plugins/outputs/opentsdb/opentsdb_test.go b/plugins/outputs/opentsdb/opentsdb_test.go
index 30323725b..6c141d463 100644
--- a/plugins/outputs/opentsdb/opentsdb_test.go
+++ b/plugins/outputs/opentsdb/opentsdb_test.go
@@ -3,9 +3,8 @@ package opentsdb
 import (
 	"reflect"
 	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
+	// "github.com/influxdata/telegraf/testutil"
+	// "github.com/stretchr/testify/require"
 )
 
 func TestBuildTagsTelnet(t *testing.T) {
@@ -42,40 +41,40 @@ func TestBuildTagsTelnet(t *testing.T) {
 	}
 }
 
-func TestWrite(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
+// func TestWrite(t *testing.T) {
+// 	if testing.Short() {
+// 		t.Skip("Skipping integration test in short mode")
+// 	}
 
-	o := &OpenTSDB{
-		Host:   testutil.GetLocalHost(),
-		Port:   4242,
-		Prefix: "prefix.test.",
-	}
+// 	o := &OpenTSDB{
+// 		Host:   testutil.GetLocalHost(),
+// 		Port:   4242,
+// 		Prefix: "prefix.test.",
+// 	}
 
-	// Verify that we can connect to the OpenTSDB instance
-	err := o.Connect()
-	require.NoError(t, err)
+// 	// Verify that we can connect to the OpenTSDB instance
+// 	err := o.Connect()
+// 	require.NoError(t, err)
 
-	// Verify that we can successfully write data to OpenTSDB
-	err = o.Write(testutil.MockMetrics())
-	require.NoError(t, err)
+// 	// Verify that we can successfully write data to OpenTSDB
+// 	err = o.Write(testutil.MockMetrics())
+// 	require.NoError(t, err)
 
-	// Verify postive and negative test cases of writing data
-	metrics := testutil.MockMetrics()
-	metrics = append(metrics, testutil.TestMetric(float64(1.0),
-		"justametric.float"))
-	metrics = append(metrics, testutil.TestMetric(int64(123456789),
-		"justametric.int"))
-	metrics = append(metrics, testutil.TestMetric(uint64(123456789012345),
-		"justametric.uint"))
-	metrics = append(metrics, testutil.TestMetric("Lorem Ipsum",
-		"justametric.string"))
-	metrics = append(metrics, testutil.TestMetric(float64(42.0),
-		"justametric.anotherfloat"))
-	metrics = append(metrics, testutil.TestMetric(float64(42.0),
-		"metric w/ specialchars"))
+// 	// Verify postive and negative test cases of writing data
+// 	metrics := testutil.MockMetrics()
+// 	metrics = append(metrics, testutil.TestMetric(float64(1.0),
+// 		"justametric.float"))
+// 	metrics = append(metrics, testutil.TestMetric(int64(123456789),
+// 		"justametric.int"))
+// 	metrics = append(metrics, testutil.TestMetric(uint64(123456789012345),
+// 		"justametric.uint"))
+// 	metrics = append(metrics, testutil.TestMetric("Lorem Ipsum",
+// 		"justametric.string"))
+// 	metrics = append(metrics, testutil.TestMetric(float64(42.0),
+// 		"justametric.anotherfloat"))
+// 	metrics = append(metrics, testutil.TestMetric(float64(42.0),
+// 		"metric w/ specialchars"))
 
-	err = o.Write(metrics)
-	require.NoError(t, err)
-}
+// 	err = o.Write(metrics)
+// 	require.NoError(t, err)
+// }