diff --git a/test/red/api/editor/projects/index_spec.js b/test/red/api/editor/projects_spec.js
similarity index 100%
rename from test/red/api/editor/projects/index_spec.js
rename to test/red/api/editor/projects_spec.js
diff --git a/test/red/runtime-api/comms_spec.js b/test/red/runtime-api/comms_spec.js
new file mode 100644
index 000000000..1db07365b
--- /dev/null
+++ b/test/red/runtime-api/comms_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("runtime-api/comms", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime-api/flows_spec.js b/test/red/runtime-api/flows_spec.js
new file mode 100644
index 000000000..ddbab2b9d
--- /dev/null
+++ b/test/red/runtime-api/flows_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("runtime-api/flows", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime-api/index_spec.js b/test/red/runtime-api/index_spec.js
new file mode 100644
index 000000000..650f96da1
--- /dev/null
+++ b/test/red/runtime-api/index_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("runtime-api/index", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime-api/library_spec.js b/test/red/runtime-api/library_spec.js
new file mode 100644
index 000000000..f996ea487
--- /dev/null
+++ b/test/red/runtime-api/library_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("runtime-api/library", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime-api/nodes_spec.js b/test/red/runtime-api/nodes_spec.js
new file mode 100644
index 000000000..a22b49081
--- /dev/null
+++ b/test/red/runtime-api/nodes_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("runtime-api/nodes", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime-api/projects_spec.js b/test/red/runtime-api/projects_spec.js
new file mode 100644
index 000000000..b84d7d883
--- /dev/null
+++ b/test/red/runtime-api/projects_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("runtime-api/projects", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime-api/settings_spec.js b/test/red/runtime-api/settings_spec.js
new file mode 100644
index 000000000..77c2090e8
--- /dev/null
+++ b/test/red/runtime-api/settings_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("runtime-api/settings", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime/library/index_spec.js b/test/red/runtime/library/index_spec.js
new file mode 100644
index 000000000..bfb550835
--- /dev/null
+++ b/test/red/runtime/library/index_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("runtime/library", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime/i18n_spec.js b/test/red/util/i18n_spec.js
similarity index 89%
rename from test/red/runtime/i18n_spec.js
rename to test/red/util/i18n_spec.js
index 0ccd8bfbf..1529c7556 100644
--- a/test/red/runtime/i18n_spec.js
+++ b/test/red/util/i18n_spec.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  **/
 
-describe("runtime/i18n", function() {
+describe("util/i18n", function() {
     it('can be required without errors', function() {
-        require("../../../red/runtime/i18n");
+        require("../../../red/util/i18n");
     });
     it.skip('more tests needed', function(){})
 });
diff --git a/test/red/util/index_spec.js b/test/red/util/index_spec.js
new file mode 100644
index 000000000..990702741
--- /dev/null
+++ b/test/red/util/index_spec.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+describe("util", function() {
+    it.skip('more tests needed', function(){})
+});
diff --git a/test/red/runtime/log_spec.js b/test/red/util/log_spec.js
similarity index 99%
rename from test/red/runtime/log_spec.js
rename to test/red/util/log_spec.js
index feda9663c..74675977a 100644
--- a/test/red/runtime/log_spec.js
+++ b/test/red/util/log_spec.js
@@ -16,9 +16,9 @@
 var should = require("should");
 var sinon = require("sinon");
 var util = require("util");
-var log = require("../../../red/runtime/log");
+var log = require("../../../red/util/log");
 
-describe("runtime/log", function() {
+describe("util/log", function() {
     beforeEach(function () {
         var spy = sinon.stub(util, 'log', function(arg){});
         var settings = {logging: { console: { level: 'metric', metrics: true } } };