diff --git a/build.gradle b/build.gradle
index fae9cdab..baf69d3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ repositories {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.21'
+    compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.24.0-eap13'
 
     compile "com.fasterxml.jackson.core:jackson-databind:2.9.3"
     compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.3"
diff --git a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/ParallelExecutionBenchmark.kt b/src/jmh/kotlin/com/github/pgutkowski/kgraphql/ParallelExecutionBenchmark.kt
index b1b59023..caad55fe 100644
--- a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/ParallelExecutionBenchmark.kt
+++ b/src/jmh/kotlin/com/github/pgutkowski/kgraphql/ParallelExecutionBenchmark.kt
@@ -5,7 +5,7 @@ import org.junit.Test
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.ThreadLocalRandom
 import java.util.concurrent.TimeUnit
-import kotlinx.coroutines.experimental.*
+import kotlinx.coroutines.*
 
 @State(Scope.Benchmark)
 @Warmup(iterations = 5)
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/configuration/SchemaConfiguration.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/configuration/SchemaConfiguration.kt
index 6a7beca1..44058473 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/configuration/SchemaConfiguration.kt
+++ b/src/main/kotlin/com/github/pgutkowski/kgraphql/configuration/SchemaConfiguration.kt
@@ -1,7 +1,7 @@
 package com.github.pgutkowski.kgraphql.configuration
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import kotlinx.coroutines.experimental.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineDispatcher
 
 data class SchemaConfiguration (
         //document parser caching mechanisms
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaConfigurationDSL.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaConfigurationDSL.kt
index 25ba254d..15f18a9d 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaConfigurationDSL.kt
+++ b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaConfigurationDSL.kt
@@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.github.pgutkowski.kgraphql.configuration.SchemaConfiguration
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.CoroutineDispatcher
+import kotlinx.coroutines.CommonPool
+import kotlinx.coroutines.CoroutineDispatcher
 
 
 class SchemaConfigurationDSL {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ParallelRequestExecutor.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ParallelRequestExecutor.kt
index 5f7c099c..f04f5226 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ParallelRequestExecutor.kt
+++ b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ParallelRequestExecutor.kt
@@ -18,10 +18,10 @@ import com.github.pgutkowski.kgraphql.schema.scalar.serializeScalar
 import com.github.pgutkowski.kgraphql.schema.structure2.Field
 import com.github.pgutkowski.kgraphql.schema.structure2.InputValue
 import com.github.pgutkowski.kgraphql.schema.structure2.Type
-import kotlinx.coroutines.experimental.channels.Channel
-import kotlinx.coroutines.experimental.defer
-import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.runBlocking
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.defer
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlin.reflect.KProperty1
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/FunctionWrapper.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/FunctionWrapper.kt
index 747a82b6..c960befc 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/FunctionWrapper.kt
+++ b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/FunctionWrapper.kt
@@ -4,8 +4,8 @@ package com.github.pgutkowski.kgraphql.schema.model
 
 import com.github.pgutkowski.kgraphql.schema.SchemaException
 import com.github.pgutkowski.kgraphql.schema.structure2.validateName
-import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.runBlocking
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlin.reflect.KFunction
 import kotlin.reflect.KType
 import kotlin.reflect.full.valueParameters
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/ParallelExecutionTest.kt b/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/ParallelExecutionTest.kt
index 91afd9c7..dd265aa3 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/ParallelExecutionTest.kt
+++ b/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/ParallelExecutionTest.kt
@@ -4,7 +4,7 @@ import com.github.pgutkowski.kgraphql.KGraphQL
 import com.github.pgutkowski.kgraphql.assertNoErrors
 import com.github.pgutkowski.kgraphql.extract
 import com.github.pgutkowski.kgraphql.deserialize
-import kotlinx.coroutines.experimental.delay
+import kotlinx.coroutines.delay
 import org.hamcrest.CoreMatchers
 import org.hamcrest.MatcherAssert
 import org.junit.Test