The Competitive State Anxiety Inventory-2 (CSAI-2) is one of the most frequently used instruments when assessing competitive state anxiety in sport psychology research. However, doubts have been expressed about the factorial validity of both the English and the Greek versions of the scale. Hence, a revised version of the inventory (CSAI-2R) has recently been suggested to be more psychometrically sound (Cox et al., 2003). In the present study, the aim was to evaluate the psychometric properties of the Swedish version of the CSAI-2 using confirmatory factor analyses. A total of 969 athletes (571 men and 398 women) competing in 26 different sports completed the Swedish version of the CSAI-2. Three different factor structures were evaluated: the original three-factor model (with cognitive anxiety, somatic anxiety and self-confidence), a two-factor model in which self-confidence was excluded, and a three-factor model containing 17 items (CSAI-2R). The results revealed that only the 17-item model displayed an acceptable fit to the data. Although some doubts remain about the amount of variance that can be attributed to error variance in the subscales, the results suggest that it is better to use the CSAI-2R rather than the original CSAI-2.