diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt
index 5c383aab6..3a90a5371 100644
--- a/unsupported/test/CMakeLists.txt
+++ b/unsupported/test/CMakeLists.txt
@@ -157,15 +157,16 @@ if(CUDA_FOUND)
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(CUDA_NVCC_FLAGS "-ccbin /usr/bin/clang" CACHE STRING "nvcc flags" FORCE)
   endif()
+  set(CUDA_NVCC_FLAGS "-std=c++11 -arch compute_30")
   cuda_include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CUDA_TOOLKIT_ROOT_DIR}/include")
-  set(EIGEN_ADD_TEST_FILENAME_EXTENSION  "cu")
+  set(EIGEN_ADD_TEST_FILENAME_EXTENSION "cu")
 
-  ei_add_test(cxx11_tensor_device "-std=c++11")
-  ei_add_test(cxx11_tensor_cuda "-std=c++11")
-  ei_add_test(cxx11_tensor_contract_cuda "-std=c++11")
-  ei_add_test(cxx11_tensor_reduction_cuda "-std=c++11")
-  ei_add_test(cxx11_tensor_random_cuda "-std=c++11")
-  ei_add_test(cxx11_tensor_argmax_cuda "-std=c++11 -I/opt-cuda-7.0/include")
+  ei_add_test(cxx11_tensor_device)
+  ei_add_test(cxx11_tensor_cuda)
+  ei_add_test(cxx11_tensor_contract_cuda)
+  ei_add_test(cxx11_tensor_reduction_cuda)
+  ei_add_test(cxx11_tensor_random_cuda)
+  ei_add_test(cxx11_tensor_argmax_cuda)
 
   unset(EIGEN_ADD_TEST_FILENAME_EXTENSION)
 endif(CUDA_FOUND)