diff --git a/ci/script.sh b/ci/script.sh
index 4b9cd22d39..9bba8b35df 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -33,6 +33,11 @@ arm_example() {
 
 main() {
     local T=$TARGET
+    local nightly=""
+
+    if [ $TRAVIS_RUST_VERSION = nightly ]; then
+        nightly="nightly"
+    fi
 
     mkdir -p ci/builds
 
@@ -41,12 +46,12 @@ main() {
         case $TRAVIS_RUST_VERSION in
             nightly*)
                 # TODO how to run a subset of these tests when timer-queue is disabled?
-                cargo test --features timer-queue --test compiletest --target $T
+                cargo test --features "$nightly,timer-queue" --test compiletest --target $T
         esac
 
         cargo check --target $T
         if [ $TARGET != thumbv6m-none-eabi ]; then
-            cargo check --features timer-queue --target $T
+            cargo check --features "$nightly,timer-queue" --target $T
         fi
 
         if [ $TRAVIS_RUST_VERSION != nightly ]; then
@@ -76,9 +81,9 @@ main() {
         return
     fi
 
-    cargo check --target $T --examples
+    cargo check --features "$nightly" --target $T --examples
     if [ $TARGET != thumbv6m-none-eabi ]; then
-        cargo check --features timer-queue --target $T --examples
+        cargo check --features "$nightly,timer-queue" --target $T --examples
     fi
 
     # run-pass tests
@@ -115,13 +120,13 @@ main() {
                 fi
 
                 if [ $ex != types ]; then
-                    arm_example "run" $ex "debug" "" "1"
-                    arm_example "run" $ex "release" "" "1"
+                    arm_example "run" $ex "debug" "$nightly" "1"
+                    arm_example "run" $ex "release" "$nightly" "1"
                 fi
 
                 if [ $TARGET != thumbv6m-none-eabi ]; then
-                    arm_example "run" $ex "debug" "timer-queue" "1"
-                    arm_example "run" $ex "release" "timer-queue" "1"
+                    arm_example "run" $ex "debug" "$nightly,timer-queue" "1"
+                    arm_example "run" $ex "release" "$nightly,timer-queue" "1"
                 fi
             done
 
@@ -139,16 +144,16 @@ main() {
                 fi
 
                 if [ $ex != types ]; then
-                    arm_example "build" $ex "debug" "" "2"
+                    arm_example "build" $ex "debug" "$nightly" "2"
                     cmp ci/builds/${ex}_debug_1.hex ci/builds/${ex}_debug_2.hex
-                    arm_example "build" $ex "release" "" "2"
+                    arm_example "build" $ex "release" "$nightly" "2"
                     cmp ci/builds/${ex}_release_1.hex ci/builds/${ex}_release_2.hex
                 fi
 
                 if [ $TARGET != thumbv6m-none-eabi ]; then
-                    arm_example "build" $ex "debug" "timer-queue" "2"
+                    arm_example "build" $ex "debug" "$nightly,timer-queue" "2"
                     cmp ci/builds/${ex}_timer-queue_debug_1.hex ci/builds/${ex}_timer-queue_debug_2.hex
-                    arm_example "build" $ex "release" "timer-queue" "2"
+                    arm_example "build" $ex "release" "$nightly,timer-queue" "2"
                     cmp ci/builds/${ex}_timer-queue_release_1.hex ci/builds/${ex}_timer-queue_release_2.hex
                 fi
             done