diff --git a/src/graphql/graphql.contribution.ts b/src/graphql/graphql.contribution.ts
index a999c9e6..1379e5ce 100644
--- a/src/graphql/graphql.contribution.ts
+++ b/src/graphql/graphql.contribution.ts
@@ -6,14 +6,10 @@
 
 import { registerLanguage } from '../_.contribution';
 
-// Allow for running under nodejs/requirejs in tests
-const _monaco: typeof monaco =
-	typeof monaco === 'undefined' ? (<any>self).monaco : monaco;
-
 registerLanguage({
 	id: 'graphql',
 	extensions: ['.graphql', '.gql'],
 	aliases: ['GraphQL', 'graphql', 'gql'],
 	mimetypes: ['application/graphql'],
-	loader: () => _monaco.Promise.wrap(import('./graphql')),
+	loader: () => import('./graphql')
 });
diff --git a/src/test/testRunner.ts b/src/test/testRunner.ts
index f425a0b6..f99a424b 100644
--- a/src/test/testRunner.ts
+++ b/src/test/testRunner.ts
@@ -30,7 +30,7 @@ export function testTokenization(_language:string|string[], tests:ITestItem[][])
 	let mainLanguage = languages[0];
 	suite(mainLanguage + ' tokenization', () => {
 		test('', (done) => {
-			_monaco.Promise.join(languages.map(l => loadLanguage(l))).then(() => {
+			Promise.all(languages.map(l => loadLanguage(l))).then(() => {
 				// clean stack
 				setTimeout(() => {
 					runTests(mainLanguage, tests);