diff --git a/src/ci/docker/nvptx-cuda/Dockerfile b/src/ci/docker/nvptx-cuda/Dockerfile
index cdb1f565bd22..b52865ced3e3 100644
--- a/src/ci/docker/nvptx-cuda/Dockerfile
+++ b/src/ci/docker/nvptx-cuda/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get install -y --no-install-recommends \
     g++ make file curl ca-certificates python git \
     cmake sudo gdb
 
-# TODO(denzp): setup `ptx-linker` CI for auttomatic binary releases.
+# FIXME: setup `ptx-linker` CI for automatic binary releases.
 RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-alpha/rust-ptx-linker.linux64.tar.gz | \
     tar -xzvC /usr/bin
 
diff --git a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs b/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
index ed5d0f245062..e8512415e66a 100644
--- a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
+++ b/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
@@ -22,9 +22,9 @@ pub fn target() -> TargetResult {
             linker: Some("rust-ptx-linker".to_string()),
 
             // With `ptx-linker` approach, it can be later overriden via link flags.
-            cpu: "sm_20".to_string(),
+            cpu: "sm_30".to_string(),
 
-            // TODO(denzp): create tests for the atomics.
+            // FIXME: create tests for the atomics.
             max_atomic_width: Some(64),
 
             // Unwinding on CUDA is neither feasible nor useful.
@@ -51,7 +51,7 @@ pub fn target() -> TargetResult {
             // This behavior is not supported by PTX ISA.
             merge_functions: MergeFunctions::Disabled,
 
-            // TODO(denzp): enable compilation tests for the target and
+            // FIXME: enable compilation tests for the target and
             // create the tests for this.
             abi_blacklist: vec![
                 Abi::Cdecl,
diff --git a/src/test/run-make/nvptx-emit-asm/kernel.rs b/src/test/run-make/nvptx-emit-asm/kernel.rs
index 070a6efd2d54..b71e18d91039 100644
--- a/src/test/run-make/nvptx-emit-asm/kernel.rs
+++ b/src/test/run-make/nvptx-emit-asm/kernel.rs
@@ -3,7 +3,7 @@
 #![feature(abi_ptx)]
 
 // Verify the default CUDA arch.
-// CHECK: .target sm_20
+// CHECK: .target sm_30
 // CHECK: .address_size 64
 
 // Verify function name doesn't contain unacceaptable characters.