In this contribution, nanosecond pulsed discharges in N2 and N2/0.9% H2O at atmospheric pressure (at 300 K) are studied with time-resolved imaging, optical emission spectroscopy and Rayleigh scattering. A 170 ns high voltage pulse is applied across two pin-shaped electrodes at a frequency of 1 kHz. The discharge consists of three phases: an ignition phase, a spark phase and a recombination phase. During the ignition phase the emission is mainly caused by molecular nitrogen (N2(C-B)). In the spark and recombination phase mainly atomic nitrogen emission is observed. The emission when H2O is added is very similar, except the small contribution of H?? and the intensity of the molecular N2(C-B) emission is less. The gas temperature during the ignition phase is about 350 K, during the discharge the gas temperature increases and is 1 µs after ignition equal to 750 K. The electron density is obtained by the broadening of the N emission line at 746 nm and, if water is added, the H?? line. The electron density reaches densities up to 4·10^24 m^-3. Addition of water has no significant influence on the gas temperature and electron density. The diagnostics used in this study are described in detail and the validity of different techniques is compared with previously reported results of other groups.