As I've always understood it, 'genre' applies more to the type of story being told - i.e, fiction, non-fiction, sci-fi, fantasy, mystery, etc. - than the specific form it's in. A mystery short story and a mystery novel are both in the same genre - the mystery genre. They're all different types of literature, or forms, or whatever you want to call it - they all fall under the same blanket.