diff --git a/test-integration/changeset.js b/test-integration/changeset.js
deleted file mode 100644
index ccc82d76..00000000
--- a/test-integration/changeset.js
+++ /dev/null
@@ -1,63 +0,0 @@
-"use strict";
-
-var assert = require("assert");
-var path = require("path");
-var child = require("child_process");
-var tmp = require("tmp");
-
-var explicitTests = [{
-	gitCloneUrl: "https://github.com/amtrack/sfdx-playground.git",
-	branch: "explicit-custom-field",
-	description: "should extract a single CustomField from a CustomObject",
-	patterns: ["CustomField/Account.VAT_Number__c"],
-	unpackaged_path: "src",
-	expected: path.join("config", "deployments", "expected")
-}];
-
-describe("force-dev-tool changeset create ...", function() {
-	var fdt = path.resolve(__dirname, "..", "bin", "cli");
-	explicitTests.forEach(function(test) {
-		it(test.description, function() {
-			if (test.skip) {
-				this.skip();
-			}
-			this.slow(5000);
-			this.timeout(20000);
-			var tmpobj = tmp.dirSync();
-			var gitDir = tmpobj.name;
-			var gitCloneCmd = child.spawnSync(
-				"git", ["clone", "-c", "core.autocrlf=false", test.gitCloneUrl, gitDir], {
-					cwd: gitDir
-				}
-			);
-			assert.deepEqual(gitCloneCmd.status, 0, gitCloneCmd.stderr.toString());
-			var gitCheckoutCmd = child.spawnSync("git", ["checkout", test.branch], {
-				cwd: gitDir
-			});
-			assert.deepEqual(gitCheckoutCmd.status, 0, gitCheckoutCmd.stderr.toString());
-			var changesetArgs = [fdt, "changeset", "create", "test"];
-			[].push.apply(changesetArgs, test.patterns);
-			var changesetCreateCmd = child.spawnSync(
-				"node", changesetArgs, {
-					cwd: gitDir
-				}
-			);
-			assert.deepEqual(
-				changesetCreateCmd.status,
-				0,
-				changesetCreateCmd.stdout.toString()
-			);
-			var diffDirsCmd = child.spawnSync(
-				"diff", [
-					"-u",
-					"-r",
-					path.join(gitDir, test.expected),
-					path.join(gitDir, "config", "deployments", "test")
-				], {
-					cwd: gitDir
-				}
-			);
-			assert.deepEqual(diffDirsCmd.status, 0, diffDirsCmd.stdout.toString());
-		});
-	});
-});
diff --git a/test/cli/changeset.js b/test/cli/changeset.js
index e1066ebc..cae0ef0a 100644
--- a/test/cli/changeset.js
+++ b/test/cli/changeset.js
@@ -57,4 +57,56 @@ describe("force-dev-tool changeset", function() {
 		assert.deepEqual(changesetCreateCmd.status, 0);
 		assert(new RegExp("38.0").test(changesetCreateCmd.stdout.toString()));
 	});
+	var explicitTests = [{
+		gitCloneUrl: "https://github.com/amtrack/sfdx-playground.git",
+		branch: "explicit-custom-field",
+		description: "should extract a single CustomField from a CustomObject",
+		patterns: ["CustomField/Account.VAT_Number__c"],
+		unpackaged_path: "src",
+		expected: path.join("config", "deployments", "expected")
+	}];
+	explicitTests.forEach(function(test) {
+		it(test.description, function() {
+			if (test.skip) {
+				this.skip();
+			}
+			this.slow(5000);
+			this.timeout(20000);
+			var tmpobj = tmp.dirSync();
+			var gitDir = tmpobj.name;
+			var gitCloneCmd = child.spawnSync(
+				"git", ["clone", "-c", "core.autocrlf=false", test.gitCloneUrl, gitDir], {
+					cwd: gitDir
+				}
+			);
+			assert.deepEqual(gitCloneCmd.status, 0, gitCloneCmd.stderr.toString());
+			var gitCheckoutCmd = child.spawnSync("git", ["checkout", test.branch], {
+				cwd: gitDir
+			});
+			assert.deepEqual(gitCheckoutCmd.status, 0, gitCheckoutCmd.stderr.toString());
+			var changesetArgs = [fdt, "changeset", "create", "test"];
+			[].push.apply(changesetArgs, test.patterns);
+			var changesetCreateCmd = child.spawnSync(
+				"node", changesetArgs, {
+					cwd: gitDir
+				}
+			);
+			assert.deepEqual(
+				changesetCreateCmd.status,
+				0,
+				changesetCreateCmd.stdout.toString()
+			);
+			var diffDirsCmd = child.spawnSync(
+				"diff", [
+					"-u",
+					"-r",
+					path.join(gitDir, test.expected),
+					path.join(gitDir, "config", "deployments", "test")
+				], {
+					cwd: gitDir
+				}
+			);
+			assert.deepEqual(diffDirsCmd.status, 0, diffDirsCmd.stdout.toString());
+		});
+	});
 });