diff --git a/backend/amazonclouddrive/amazonclouddrive_test.go b/backend/amazonclouddrive/amazonclouddrive_test.go
index cc15c4717..7c76a66a9 100644
--- a/backend/amazonclouddrive/amazonclouddrive_test.go
+++ b/backend/amazonclouddrive/amazonclouddrive_test.go
@@ -2,6 +2,9 @@
 //
 // Automatically generated - DO NOT EDIT
 // Regenerate with: make gen_tests
+
+// +build acd
+
 package amazonclouddrive_test
 
 import (
diff --git a/fstest/fstests/gen_tests.go b/fstest/fstests/gen_tests.go
index b8bf53be2..705343202 100644
--- a/fstest/fstests/gen_tests.go
+++ b/fstest/fstests/gen_tests.go
@@ -151,7 +151,7 @@ func main() {
 	generateTestProgram(t, fns, "Drive")
 	generateTestProgram(t, fns, "GoogleCloudStorage")
 	generateTestProgram(t, fns, "Dropbox", buildConstraint("go1.7"))
-	generateTestProgram(t, fns, "AmazonCloudDrive")
+	generateTestProgram(t, fns, "AmazonCloudDrive", buildConstraint("acd"))
 	generateTestProgram(t, fns, "OneDrive")
 	generateTestProgram(t, fns, "Hubic")
 	generateTestProgram(t, fns, "B2")
diff --git a/fstest/test_all/test_all.go b/fstest/test_all/test_all.go
index 72c6548fd..31bf8fcbe 100644
--- a/fstest/test_all/test_all.go
+++ b/fstest/test_all/test_all.go
@@ -32,11 +32,11 @@ type remoteConfig struct {
 
 var (
 	remotes = []remoteConfig{
-		{
-			Name:     "TestAmazonCloudDrive:",
-			SubDir:   false,
-			FastList: false,
-		},
+		// {
+		// 	Name:     "TestAmazonCloudDrive:",
+		// 	SubDir:   false,
+		// 	FastList: false,
+		// },
 		{
 			Name:     "TestB2:",
 			SubDir:   true,