diff --git a/nc_test/CMakeLists.txt b/nc_test/CMakeLists.txt
index ffbf9429a..f31da7c3b 100644
--- a/nc_test/CMakeLists.txt
+++ b/nc_test/CMakeLists.txt
@@ -8,9 +8,6 @@ ENDFOREACH()
 
 
 SET (nc_test_SRC nc_test.c error.c test_get.c test_put.c test_read.c test_write.c util.c)
-ADD_EXECUTABLE(nc_test ${nc_test_SRC})
-TARGET_LINK_LIBRARIES(nc_test netcdf)
-#SET_PROPERTY(TARGET nc_test PROPERTY LABELS nc_test)
 
 # Some extra tests
 SET(TESTS t_nc tst_small tst_misc tst_norm tst_names tst_nofill tst_nofill2 tst_nofill3)
@@ -46,7 +43,7 @@ FOREACH(CTEST ${TESTS})
 	SET_PROPERTY(TEST nc_test_${CTEST} PROPERTY LABELS nc_test)
 ENDFOREACH()
 
-ADD_TEST(nc_test ${EXECUTABLE_OUTPUT_PATH}/nc_test)
+
 #SET_PROPERTY(TEST nc_test PROPERTY LABELS nc_test)
 
 IF(BUILD_DISKLESS)
@@ -63,6 +60,13 @@ IF(BUILD_DISKLESS)
   
 ENDIF()
 
+
+ADD_EXECUTABLE(nc_test ${nc_test_SRC})
+TARGET_LINK_LIBRARIES(nc_test netcdf)
+ADD_TEST(nc_test ${EXECUTABLE_OUTPUT_PATH}/nc_test)
+SET_PROPERTY(TEST nc_test PROPERTY LABELS nc_test)
+
+
 # Copy some test files from current source dir to out-of-tree build dir.
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)